diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 7d01830..48cca4f 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 saveUserFull="Timothy Allen" version="3.32.2-Lima" saveUser="tim" saveDateTime="2023-09-07T23:12:25" projectname="Gun Run">
+<qgis version="3.32.2-Lima" saveUserFull="Timothy Allen" saveDateTime="2023-09-11T14:42:58" projectname="Gun Run" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,255 +17,256 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer edl-distance-unit="0" edl-strength="1000" light-altitude="45" edl-distance="0.5" hillshading-is-active="0" combined-method="0" hillshading-is-multidirectional="0" edl-is-active="1" is-active="0" hillshading-z-factor="1" light-azimuth="315"/>
+  <elevation-shading-renderer edl-distance-unit="0" combined-method="0" light-altitude="45" hillshading-is-active="0" hillshading-is-multidirectional="0" edl-distance="0.5" edl-is-active="1" edl-strength="1000" light-azimuth="315" is-active="0" hillshading-z-factor="1"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" name="Marshals" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Marshals" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" name="marshal_positions" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-            <Option name="showFeatureCount" type="int" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <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 legend_split_behavior="0" expanded="1" patch_size="0,0" name="extra_security" source="./extra_security.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="extra_security20170921130834191">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="extra_security20170921130834191" providerKey="ogr" name="extra_security" legend_exp="" source="./extra_security.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_exp="" providerKey="delimitedtext" id="marshals_by_position20161003112326575">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext" name="marshals_by_position" legend_exp="" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" type="int" value="1"/>
+            <Option type="int" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" name="complete_marshal_overview" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" name="marshal_overviews" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <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" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" name="fencing" legend_exp="" source="./fencing.shp|layername=fencing">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option 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 legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" name="cone_groups" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" name="fence_groups" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" providerKey="virtual" name="fence_and_cone_groups" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" name="Markers" groupLayer="" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" expanded="1" name="Markers" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" checked="Qt::Checked" legend_exp="" providerKey="memory" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549">
+        <layer-tree-layer checked="Qt::Checked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" providerKey="memory" name="route_markers" legend_exp="" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={cfc41d11-3570-4946-909c-43636e49a7a2}">
           <customproperties>
             <Option type="Map">
-              <Option name="showFeatureCount" type="int" value="1"/>
+              <Option type="invalid" name="expandedLegendNodes"/>
+              <Option type="int" name="showFeatureCount" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={458fbc48-5594-4b39-9810-4ac65744537d}" checked="Qt::Unchecked" legend_exp="" providerKey="memory" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02">
+        <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" providerKey="memory" name="route_markers" legend_exp="" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={97392ca3-9c79-4882-9d0f-3902063831df}">
           <customproperties>
             <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option name="showFeatureCount" type="int" value="1"/>
+              <Option type="invalid" name="expandedLegendNodes"/>
+              <Option type="int" name="showFeatureCount" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="int" value="0"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" name="showFeatureCount" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f">
+    <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" name="timelapse" legend_exp="" source="./timelapse.shp|layername=timelapse">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" name="Feeding Stations" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Feeding Stations" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="water_tables" source="./water_tables.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="water_tables20170921142016467">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="water_tables20170921142016467" providerKey="ogr" name="water_tables" legend_exp="" source="./water_tables.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" name="Ask Me" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Ask Me" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" name="poi_labels" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" name="directions_to_start" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" name="Residents Access" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Residents Access" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="mayor" source="./mayor.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" name="mayor" legend_exp="" source="./mayor.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="viplabels" source="./viplabels.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" name="viplabels" legend_exp="" source="./viplabels.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="vipaccess" source="./vipaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" name="vipaccess" legend_exp="" source="./vipaccess.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="golfaccess" source="./golfaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" name="golfaccess" legend_exp="" source="./golfaccess.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" name="residents_access_roads" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" name="residents_access" legend_exp="" source="./residents_access.shp|layername=residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="OSM data" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="OSM data" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="osm_roads" source="./osm_roads.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" name="osm_roads" legend_exp="" source="./osm_roads.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="osm_places" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" name="osm_places" legend_exp="" source="./osm_places.shp|layername=osm_places">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="Start and Finish pages" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Start and Finish pages" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="data-comments" source="./data-comments.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" name="data-comments" legend_exp="" source="./data-comments.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="start_finish_area" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" name="start_finish_area" legend_exp="" source="./start_finish_area.shp">
         <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" name="Elevation" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Elevation" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="capetownelevation-1m" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" name="capetownelevation-1m" legend_exp="" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="Map" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Map" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_exp="" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="Outlines" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_exp="" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" name="Outlines" legend_exp="" 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">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -296,39 +297,39 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02</item>
       <item>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</item>
       <item>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</item>
+      <item>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings self-snapping="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" tolerance="10" enabled="0" maxScale="0" type="1" unit="1">
+  <snapping-settings mode="3" type="1" unit="1" enabled="0" tolerance="10" intersection-snapping="1" scaleDependencyMode="0" self-snapping="1" maxScale="0" minScale="0">
     <individual-layer-settings>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="water_tables20170921142016467"/>
-      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="extra_security20170921130834191"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-      <layer-setting minScale="0" tolerance="20" enabled="1" maxScale="0" type="2" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" minScale="0"/>
+      <layer-setting type="0" units="1" enabled="0" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="2" enabled="0" tolerance="0" id="extra_security20170921130834191" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" minScale="0"/>
+      <layer-setting type="0" units="1" enabled="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="2" enabled="0" tolerance="0" id="water_tables20170921142016467" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -336,10 +337,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.39553763047966228</xmin>
-      <ymin>-33.91875794015667367</ymin>
-      <xmax>18.42054863549070021</xmax>
-      <ymax>-33.88880497692461091</ymax>
+      <xmin>18.40606100627099551</xmin>
+      <ymin>-33.90836307879926892</ymin>
+      <xmax>18.40755427348211271</xmax>
+      <ymax>-33.90684867733166641</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -360,176 +361,176 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" name="Marshals" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshal_positions" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup checked="Qt::Checked" name="Marshals" open="true">
+      <legendlayer checked="Qt::Checked" name="marshal_positions" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="extra_security" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="extra_security" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshals_by_position" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="marshals_by_position" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="complete_marshal_overview" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="complete_marshal_overview" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="marshal_overviews" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="marshal_overviews" showFeatureCount="0" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fencing" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <legendgroup checked="Qt::Checked" name="Fencing and Cones" open="true">
+      <legendlayer checked="Qt::Checked" name="fencing" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="cone_groups" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="cone_groups" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_groups" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="fence_groups" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_and_cone_groups" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="fence_and_cone_groups" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Routes" checked="Qt::Checked">
-      <legendgroup open="true" name="Markers" checked="Qt::Checked">
-        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+    <legendgroup checked="Qt::Checked" name="Routes" open="true">
+      <legendgroup checked="Qt::Checked" name="Markers" open="true">
+        <legendlayer checked="Qt::Checked" name="route_markers" showFeatureCount="1" open="true" drawingOrder="-1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Unchecked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+        <legendlayer checked="Qt::Unchecked" name="route_markers" showFeatureCount="1" open="true" drawingOrder="-1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="all_routes" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Checked" name="all_routes" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="timelapse" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
+    <legendlayer checked="Qt::Unchecked" name="timelapse" showFeatureCount="0" open="false" drawingOrder="-1">
+      <filegroup hidden="false" open="false">
         <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="water_tables" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
+      <legendlayer checked="Qt::Checked" name="water_tables" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="poi_labels" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
+      <legendlayer checked="Qt::Unchecked" name="poi_labels" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="directions_to_start" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="directions_to_start" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="mayor" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
+      <legendlayer checked="Qt::Unchecked" name="mayor" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="viplabels" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="viplabels" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="vipaccess" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="vipaccess" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="golfaccess" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="golfaccess" showFeatureCount="0" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access_roads" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="residents_access_roads" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="residents_access" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="1" name="osm_roads" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
+    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
+      <legendlayer checked="Qt::Checked" name="osm_roads" showFeatureCount="1" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="osm_places" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Checked" name="osm_places" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="data-comments" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
+      <legendlayer checked="Qt::Unchecked" name="data-comments" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="start_finish_area" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="start_finish_area" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="capetownelevation-1m" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
+      <legendlayer checked="Qt::Unchecked" name="capetownelevation-1m" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Map" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup checked="Qt::Checked" name="Map" open="true">
+      <legendlayer checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="Outlines" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Checked" name="Outlines" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="annotation">
+  <main-annotation-layer type="annotation" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="0" styleCategories="AllStyleCategories" minScale="0" autoRefreshEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -590,7 +591,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="100000" type="raster">
+    <maplayer type="raster" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="100000" styleCategories="AllStyleCategories" minScale="1e+08" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -656,7 +657,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -681,97 +682,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
+      <elevation enabled="0" zoffset="0" band="1" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -780,28 +781,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Value"/>
+          <Option 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>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling maxOversampling="2" enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer nodataColor="" opacity="0.5" blueBand="3" alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor">
+        <rasterrenderer type="multibandcolor" redBand="1" alphaBand="-1" greenBand="2" opacity="0.5" nodataColor="" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -812,14 +813,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeStrength="100" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeRed="255" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="raster">
+    <maplayer type="raster" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="0" styleCategories="AllStyleCategories" minScale="1e+08" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -885,7 +886,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -908,97 +909,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
+      <elevation enabled="0" zoffset="0" band="1" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1007,28 +1008,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Undefined"/>
+          <Option 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>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling maxOversampling="2" enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer nodataColor="" opacity="0.75" alphaBand="-1" band="1" type="singlebandcolordata">
+        <rasterrenderer type="singlebandcolordata" alphaBand="-1" band="1" opacity="0.75" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1039,14 +1040,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeStrength="100" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeRed="255" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1112,7 +1113,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="EPSG:4326" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1126,8 +1127,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_km" expression="$length * 100" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_m" expression="$length * 100 * 1000" length="-1" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1140,264 +1141,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="RouteLen" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="RouteLen" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="Show by day" symbol="0" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule label="21KM" symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule label="10KM" symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule label="5KM" symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule label="Trail" symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day" symbol="0">
+            <rule description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" label="21KM" checkstate="0" symbol="1"/>
+            <rule description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" label="10KM" checkstate="0" symbol="2"/>
+            <rule description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; ILIKE '5KM%'" label="5KM" checkstate="0" symbol="3"/>
+            <rule description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" label="Trail" checkstate="0" symbol="4"/>
           </rule>
-          <rule label="Always show" symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule label="Always show by day" symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" checkstate="0" symbol="5"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Always show by day" checkstate="0" symbol="6"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@0@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1405,308 +1406,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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; ILIKE '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="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{d9268524-45f1-4731-945d-c43780c8de62}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="1"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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="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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1714,308 +1715,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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.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="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@2@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2023,308 +2024,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@3@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@3@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="145,211,55,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2332,308 +2333,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,211,55,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@4@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="0,72,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@4@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@4@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,72,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2641,302 +2642,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,72,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@4@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,72,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@4@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,72,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="5" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="6" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="6" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.46"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2948,334 +2949,334 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
+          <rule description="Active routes" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round($length / 1000, 0)" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round($length / 1000, 0)" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="164,113,88,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="1" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="km_marker()" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="1" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
+          <rule description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" active="0">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100, 4 )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100, 4 )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="164,113,88,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="50" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapAtNoCost" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="50" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="km_marker()" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapAtNoCost" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3284,77 +3285,70 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" 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>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{99bd229d-7319-436f-b616-1be11812c381}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3362,16 +3356,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3382,8 +3376,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3392,8 +3386,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3402,8 +3396,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3412,8 +3406,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3422,8 +3416,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3446,8 +3440,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3456,8 +3450,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3466,24 +3460,24 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="begin" name=""/>
+        <alias index="2" field="end" name=""/>
+        <alias index="3" field="Distance" name=""/>
+        <alias index="4" field="RouteLen" name=""/>
+        <alias index="5" field="Sort" name=""/>
+        <alias index="6" field="day" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="length_m" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -3498,28 +3492,28 @@
         <policy policy="Duplicate" field="length_m"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Sort" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="Name" exp=""/>
@@ -3534,25 +3528,25 @@
         <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_km" expression="$length * 100" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_m" expression="$length * 100 * 1000" length="-1" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;">
         <columns>
-          <column width="121" name="Name" hidden="0" type="field"/>
-          <column width="141" name="begin" hidden="0" type="field"/>
-          <column width="31" name="end" hidden="0" type="field"/>
-          <column width="66" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="39" name="RouteLen" hidden="0" type="field"/>
-          <column width="250" name="Source" hidden="0" type="field"/>
-          <column width="175" name="length_m" hidden="0" type="field"/>
-          <column width="50" name="Sort" hidden="0" type="field"/>
-          <column width="31" name="day" hidden="0" type="field"/>
-          <column width="266" name="length_km" hidden="0" type="field"/>
+          <column type="field" width="121" name="Name" hidden="0"/>
+          <column type="field" width="141" name="begin" hidden="0"/>
+          <column type="field" width="31" name="end" hidden="0"/>
+          <column type="field" width="66" name="Distance" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="39" name="RouteLen" hidden="0"/>
+          <column type="field" width="250" name="Source" hidden="0"/>
+          <column type="field" width="175" name="length_m" hidden="0"/>
+          <column type="field" width="50" name="Sort" hidden="0"/>
+          <column type="field" width="31" name="day" hidden="0"/>
+          <column type="field" width="266" name="length_km" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3584,53 +3578,53 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </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="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <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"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3704,189 +3698,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{53b6bbaf-4722-434f-a142-936b95477967}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="183,72,75,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3897,15 +3891,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option 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>
@@ -3935,9 +3929,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="ID"/>
@@ -3945,14 +3939,14 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="elevation"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="ID" applyOnUpdate="0"/>
-        <default expression="" field="height" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
+        <default field="ID" applyOnUpdate="0" expression=""/>
+        <default field="height" applyOnUpdate="0" expression=""/>
+        <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="ID" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="height" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="elevation" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="ID" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="height" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="elevation" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="ID" exp=""/>
@@ -3961,9 +3955,9 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3986,7 +3980,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4062,173 +4056,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4239,15 +4233,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option 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 type="QString" value=""/>
         </activeChecks>
@@ -4286,10 +4280,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -4298,16 +4292,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="page" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -4317,9 +4311,9 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4342,18 +4336,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </wgs84extent>
       <id>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
@@ -4408,7 +4402,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4437,173 +4431,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="243,166,178,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="38,162,105,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="cross"/>
+                <Option 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="38,162,105,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="cross"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4614,68 +4608,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;name&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="int" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="int" 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 opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="1" width="15">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4683,22 +4677,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -4749,12 +4743,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
-        <alias name="" index="5" field="cone_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="fence_len" name=""/>
+        <alias index="5" field="cone_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -4765,20 +4759,20 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="cone_len"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="name" exp=""/>
@@ -4790,16 +4784,16 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="306" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="306" name="name" hidden="0"/>
+          <column type="field" width="-1" name="group" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4831,32 +4825,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4932,173 +4926,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="243,166,178,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="38,162,105,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="f_diagonal"/>
+                <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="38,162,105,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="f_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5109,68 +5103,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;name&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="int" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="int" 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 opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="1" width="15">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5178,22 +5172,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -5237,11 +5231,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="cone_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -5251,18 +5245,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="cone_len"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="name" exp=""/>
@@ -5273,17 +5267,17 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="306" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" name="fence_len" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="306" name="name" hidden="0"/>
+          <column type="field" width="-1" name="group" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column type="field" width="-1" name="fence_len" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5315,32 +5309,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5406,7 +5400,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5431,189 +5425,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,85,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5624,151 +5618,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="Name" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="Name" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="LineGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="LineGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5776,16 +5770,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5808,20 +5802,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Name"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="Name"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -5829,13 +5823,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5867,12 +5861,12 @@ 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 name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5880,7 +5874,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5946,7 +5940,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5971,319 +5965,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule label="10KM" symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule label="5KM" symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" label="21KM" symbol="0"/>
+          <rule description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" label="10KM" symbol="1"/>
+          <rule description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" label="5KM" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="miter"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="area"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@0@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6291,147 +6285,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6439,100 +6433,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{43e5e783-9402-4471-b264-9b43c9035744}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6540,147 +6534,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@2@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6688,100 +6682,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@2@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6789,41 +6783,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="69,100,25,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6835,66 +6829,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6902,16 +6896,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6929,28 +6923,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="Distance"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -6958,13 +6952,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
+          <column type="field" width="-1" name="Distance" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6996,30 +6990,30 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -7027,7 +7021,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7101,187 +7095,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="0.796078" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.796078" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="227,0,185,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7292,268 +7286,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="1" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="8" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontSize="4" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="227,0,185,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="227,0,185,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="4" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="2" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -7562,200 +7556,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7763,16 +7757,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="10" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7783,8 +7777,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7793,8 +7787,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7803,17 +7797,17 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -7821,14 +7815,14 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="type"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="position" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -7837,14 +7831,14 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="position" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7920,18 +7914,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.90152236072362513</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.90152236072362513</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </wgs84extent>
       <id>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22</datasource>
@@ -7986,7 +7980,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8015,173 +8009,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,85,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,85,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8192,68 +8186,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;name&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8261,22 +8255,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -8320,11 +8314,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="fence_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -8334,18 +8328,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="fence_len"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="name" exp=""/>
@@ -8356,17 +8350,17 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="415" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column type="field" width="415" name="name" hidden="0"/>
+          <column type="field" width="-1" name="group" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="fence_len" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8398,46 +8392,46 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </wgs84extent>
       <id>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</id>
       <datasource>./fencing.shp|layername=fencing</datasource>
@@ -8492,7 +8486,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="EPSG:4326" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8506,26 +8500,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyDrawingHints="1" simplifyLocal="1" minScale="1e+08" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" readOnly="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" version="3.8.3-Zanzibar" maxScale="0" simplifyAlgorithm="0" simplifyDrawingTol="1">
+          <qgis labelsEnabled="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyAlgorithm="0" readOnly="0" maxScale="0" styleCategories="AllStyleCategories" minScale="1e+08" simplifyLocal="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" type="RuleRenderer">
+            <renderer-v2 type="RuleRenderer" symbollevels="1" forceraster="0" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol alpha="1" clip_to_extent="1" name="0" force_rhr="0" type="line">
-                  <layer locked="0" pass="0" enabled="1" class="SimpleLine">
+                <symbol type="line" alpha="1" clip_to_extent="1" name="0" force_rhr="0">
+                  <layer pass="0" class="SimpleLine" enabled="1" locked="0">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8544,9 +8538,9 @@ def my_form_open(dialog, layer, feature):
                     <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8557,62 +8551,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontSize="11" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.8" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Regular" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="comment">
-                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                      <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.6" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" fieldName="comment" isExpression="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="0.8" multilineHeight="1" fontStrikeout="0" fontCapitals="0" namedStyle="Regular" previewBkgrdColor="#ffffff" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                      <background shapeBlendMode="0" shapeOpacity="0.6" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeBorderWidth="0.6" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeRotation="0" shapeSizeY="1" shapeRadiiY="1" shapeDraw="1"/>
+                      <shadow shadowOffsetUnit="MM" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" placementFlags="2" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="5" yOffset="0" rotationAngle="0" distUnits="MM"/>
-                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" displayAll="1" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                    <text-format autoWrapLength="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                    <placement fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" offsetUnits="MM" xOffset="0" distUnits="MM" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" quadOffset="4" centroidInside="0" preserveRotation="1" dist="5" priority="5" placement="4" placementFlags="2" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" yOffset="0"/>
+                    <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="1" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
-                            <Option name="type" value="2" type="int"/>
+                        <Option 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 name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
-                            <Option name="type" value="2" 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 name="type" value="collection" 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)')">
                   <settings>
-                    <text-style fontSize="12" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Semibold" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'">
-                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                      <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" fieldName="round( $length, 1) || 'm'" isExpression="1" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" multilineHeight="1" fontStrikeout="0" fontCapitals="0" namedStyle="Semibold" previewBkgrdColor="#ffffff" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                      <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeRotation="0" shapeSizeY="0" shapeRadiiY="0" shapeDraw="0"/>
+                      <shadow shadowOffsetUnit="MM" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" placementFlags="15" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="1" yOffset="0" rotationAngle="0" distUnits="MM"/>
-                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" displayAll="0" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                    <text-format autoWrapLength="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                    <placement fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" offsetUnits="MM" xOffset="0" distUnits="MM" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" quadOffset="4" centroidInside="0" preserveRotation="1" dist="1" priority="5" placement="2" placementFlags="15" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" yOffset="0"/>
+                    <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
-                            <Option name="type" value="2" type="int"/>
+                        <Option 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 name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
-                            <Option name="type" value="2" 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 name="type" value="collection" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8620,8 +8614,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -8629,21 +8623,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory opacity="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penWidth="0" penAlpha="255" width="15" rotationOffset="270" minScaleDenominator="0" barWidth="5" backgroundAlpha="255" minimumSize="0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+              <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" height="15" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" opacity="1" rotationOffset="270" penColor="#000000" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" sizeType="MM" diagramOrientation="Up" barWidth="5" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" minimumSize="0" minScaleDenominator="0" width="15">
+                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+            <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" 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>
@@ -8727,45 +8721,45 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" index="0" field="id"/>
-              <alias name="" index="1" field="group"/>
-              <alias name="" index="2" field="comment"/>
-              <alias name="" index="3" field="moveable"/>
-              <alias name="" index="4" field="type"/>
-              <alias name="" index="5" field="name"/>
-              <alias name="" index="6" field="hidden"/>
-              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-              <alias name="" index="9" field="fence_len"/>
-              <alias name="" index="10" field="cone_len"/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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"/>
+              <default field="id" applyOnUpdate="0" expression=""/>
+              <default field="group" applyOnUpdate="0" expression=""/>
+              <default field="comment" applyOnUpdate="0" expression=""/>
+              <default field="moveable" applyOnUpdate="0" expression=""/>
+              <default field="type" applyOnUpdate="0" expression=""/>
+              <default field="name" applyOnUpdate="0" expression=""/>
+              <default field="hidden" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+              <default field="fence_len" applyOnUpdate="0" expression=""/>
+              <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="id"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="group"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="comment"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="moveable"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="type"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="name"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="hidden"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positiony"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positionx"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="fence_len"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="cone_len"/>
+              <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="comment" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="moveable" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="hidden" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint desc="" field="id" exp=""/>
@@ -8781,27 +8775,27 @@ def my_form_open(dialog, layer, feature):
               <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
+              <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" precision="0"/>
+              <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0"/>
+              <field type="6" subType="0" typeName="double precision" comment="" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" precision="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+            <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;">
               <columns>
-                <column width="-1" name="id" hidden="0" type="field"/>
-                <column width="-1" name="group" hidden="0" type="field"/>
-                <column width="-1" hidden="1" type="actions"/>
-                <column width="223" name="comment" hidden="0" type="field"/>
-                <column width="-1" name="moveable" hidden="0" type="field"/>
-                <column width="-1" name="type" hidden="0" type="field"/>
-                <column width="414" name="name" hidden="0" type="field"/>
-                <column width="-1" name="hidden" hidden="0" type="field"/>
-                <column width="-1" name="fence_len" hidden="0" type="field"/>
-                <column width="-1" name="cone_len" hidden="0" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
+                <column type="field" width="-1" name="id" hidden="0"/>
+                <column type="field" width="-1" name="group" hidden="0"/>
+                <column type="actions" width="-1" hidden="1"/>
+                <column type="field" width="223" name="comment" hidden="0"/>
+                <column type="field" width="-1" name="moveable" hidden="0"/>
+                <column type="field" width="-1" name="type" hidden="0"/>
+                <column type="field" width="414" name="name" hidden="0"/>
+                <column type="field" width="-1" name="hidden" hidden="0"/>
+                <column type="field" width="-1" name="fence_len" hidden="0"/>
+                <column type="field" width="-1" name="cone_len" hidden="0"/>
+                <column type="field" width="-1" name="auxiliary_storage_labeling_positiony" hidden="1"/>
+                <column type="field" width="-1" name="auxiliary_storage_labeling_positionx" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8832,32 +8826,32 @@ 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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8874,458 +8868,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="1" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Cones" symbol="0"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Moveable fences" symbol="1"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Fixed fences" symbol="2"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Construction" symbol="3"/>
           </rule>
-          <rule label="Is Visible" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-          <rule label="Always show" symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Is Visible" checkstate="0" symbol="4"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="1;4"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="Point"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dot"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="4;3"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="5" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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.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="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9333,670 +9327,670 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{77c2da81-3827-4244-9739-7740942dd20c}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{63187879-e575-420a-b139-9295c560dc57}">
+        <rules key="{b08c8161-de6f-41d9-a933-40d5428d7db9}">
+          <rule key="{bc58db75-d3ce-4eaf-8459-5b648cb31e6d}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="comment" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="comment" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="0.80000000000000004" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeJoinStyle="128" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.59999999999999998" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="1" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.6"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                        <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="5" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8200000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="1" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1.8200000000000001" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                  <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{1125f4a3-b660-4c4e-bb30-9a3f89c0fc6e}">
+          <rule description="Fence lengths" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{8c77ba5e-b512-4ff7-b7ad-7fb26939c5cd}">
+          <rule description="Cones lengths" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{db4fb198-5646-4029-8e3c-b5f68e241df8}">
+          <rule key="{ed34792d-3215-42ff-8038-8130a45d3742}" active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="&quot;hidden&quot; IS NULL" description="Always show" key="{a7eac08d-b9bd-4780-93fa-cd225df55dde}">
+          <rule description="Always show" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}" active="0" filter="&quot;hidden&quot; IS NULL">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -10005,68 +9999,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;id&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10074,16 +10068,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10162,16 +10156,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
-        <alias name="" index="7" field="day"/>
-        <alias name="" index="8" field="fence_len"/>
-        <alias name="" index="9" field="cone_len"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="day" name=""/>
+        <alias index="8" field="fence_len" name=""/>
+        <alias index="9" field="cone_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -10186,28 +10180,28 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="cone_len"/>
       </splitPolicies>
       <defaults>
-        <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="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default field="moveable" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="hidden" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="comment" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="moveable" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="hidden" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="comment" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="moveable" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="hidden" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -10222,26 +10216,26 @@ def my_form_open(dialog, layer, feature):
         <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="31" name="id" hidden="0" type="field"/>
-          <column width="52" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="143" name="comment" hidden="0" type="field"/>
-          <column width="-1" name="moveable" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="303" name="name" hidden="0" type="field"/>
-          <column width="54" name="hidden" hidden="0" type="field"/>
-          <column width="74" name="fence_len" hidden="0" type="field"/>
-          <column width="40" name="day" hidden="0" type="field"/>
-          <column width="65" name="cone_len" hidden="0" type="field"/>
+          <column type="field" width="31" name="id" hidden="0"/>
+          <column type="field" width="52" name="group" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="85" name="comment" hidden="0"/>
+          <column type="field" width="-1" name="moveable" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="340" name="name" hidden="0"/>
+          <column type="field" width="54" name="hidden" hidden="0"/>
+          <column type="field" width="74" name="fence_len" hidden="0"/>
+          <column type="field" width="40" name="day" hidden="0"/>
+          <column type="field" width="65" name="cone_len" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10273,53 +10267,53 @@ 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="1" name="day"/>
-        <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="day" editable="1"/>
+        <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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="comment" reuseLastValue="0"/>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="hidden" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="moveable" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="comment"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="hidden"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="moveable"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10393,189 +10387,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,178,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10586,66 +10580,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10653,16 +10647,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10678,28 +10672,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10731,10 +10725,10 @@ 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 name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10742,7 +10736,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10816,173 +10810,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="26,0,201,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="dot"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10993,10 +10987,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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>' )"/>
@@ -11008,62 +11002,62 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11071,22 +11065,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option 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 name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11097,8 +11091,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11107,8 +11101,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11117,8 +11111,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11132,10 +11126,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -11144,16 +11138,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="page" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -11163,15 +11157,15 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="page" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="page" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11203,14 +11197,14 @@ 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 name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11218,7 +11212,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11284,7 +11278,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11295,7 +11289,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join customPrefix="csv_" joinFieldName="position" memoryCache="0" editable="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575">
+        <join cascadedDelete="0" memoryCache="0" customPrefix="csv_" dynamicForm="0" upsertOnEdit="1" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" editable="1" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -11322,264 +11316,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="id" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="id" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="114,155,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show by day in marshal plan" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule label="Always show in marshal plan" symbol="1" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule label="Show in marshal maps" symbol="2" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day in marshal plan" symbol="0"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Always show in marshal plan" symbol="1"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.8" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
+            <layer pass="1" class="SimpleMarker" enabled="1" locked="0" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="Pixel"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.8" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
+            <layer pass="1" class="SimpleMarker" enabled="1" locked="0" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="Pixel"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="0.01" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.01" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
+            <layer pass="1" class="SimpleMarker" enabled="1" locked="0" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11588,824 +11582,824 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="231,113,72,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="2" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="231,113,72,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="2" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </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="{fd239986-b557-4314-b05a-d8c40105e0bc}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.5" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.5" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="8" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="5" scaleMin="1" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.59999999999999998" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.59999999999999998" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="8" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="5" scaleMin="1" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings calloutType="simple">
-              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="133,182,111,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="133,182,111,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="10" scaleMin="1" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -12414,205 +12408,203 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" 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>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{444d8fb8-2321-4272-9699-88b713425993}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12620,16 +12612,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12640,8 +12632,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12650,8 +12642,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12660,8 +12652,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12670,8 +12662,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12685,11 +12677,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -12699,18 +12691,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <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="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="notes" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="notes" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="position" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="notes" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -12721,16 +12713,16 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="notes" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="position" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="notes" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12762,132 +12754,132 @@ 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_day"/>
-        <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_race"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="marshals_by_position_captain"/>
-        <field editable="0" name="marshals_by_position_captain_phone"/>
-        <field editable="0" name="marshals_by_position_club"/>
-        <field editable="0" name="marshals_by_position_day"/>
-        <field editable="0" name="marshals_by_position_first_runner"/>
-        <field editable="0" name="marshals_by_position_instructions"/>
-        <field editable="0" name="marshals_by_position_last_runner"/>
-        <field editable="0" name="marshals_by_position_position"/>
-        <field editable="0" name="marshals_by_position_race"/>
-        <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_day" 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_race" 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="marshals_by_position_captain" editable="0"/>
+        <field name="marshals_by_position_captain_phone" editable="0"/>
+        <field name="marshals_by_position_club" editable="0"/>
+        <field name="marshals_by_position_day" editable="0"/>
+        <field name="marshals_by_position_first_runner" editable="0"/>
+        <field name="marshals_by_position_instructions" editable="0"/>
+        <field name="marshals_by_position_last_runner" editable="0"/>
+        <field name="marshals_by_position_position" editable="0"/>
+        <field name="marshals_by_position_race" editable="0"/>
+        <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 name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_email" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_day" labelOnTop="0"/>
-        <field name="csv_days" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_race" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="marshals_by_position_captain" labelOnTop="0"/>
-        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
-        <field name="marshals_by_position_club" labelOnTop="0"/>
-        <field name="marshals_by_position_day" labelOnTop="0"/>
-        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_instructions" labelOnTop="0"/>
-        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_position" labelOnTop="0"/>
-        <field name="marshals_by_position_race" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_email"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_day"/>
+        <field labelOnTop="0" name="csv_days"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_race"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="marshals_by_position_captain"/>
+        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
+        <field labelOnTop="0" name="marshals_by_position_club"/>
+        <field labelOnTop="0" name="marshals_by_position_day"/>
+        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_instructions"/>
+        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_position"/>
+        <field labelOnTop="0" name="marshals_by_position_race"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="csv_captain" reuseLastValue="0"/>
-        <field name="csv_captain_email" reuseLastValue="0"/>
-        <field name="csv_captain_phone" reuseLastValue="0"/>
-        <field name="csv_club" reuseLastValue="0"/>
-        <field name="csv_day" reuseLastValue="0"/>
-        <field name="csv_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_race" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
-        <field name="marshals_by_position_club" reuseLastValue="0"/>
-        <field name="marshals_by_position_day" reuseLastValue="0"/>
-        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
-        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_position" reuseLastValue="0"/>
-        <field name="marshals_by_position_race" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_day"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_race"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
+        <field reuseLastValue="0" name="marshals_by_position_club"/>
+        <field reuseLastValue="0" name="marshals_by_position_day"/>
+        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
+        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_position"/>
+        <field reuseLastValue="0" name="marshals_by_position_race"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -12937,7 +12929,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" readOnly="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" maxScale="100000" type="vector" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer type="vector" geometry="No geometry" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" refreshOnNotifyMessage="" maxScale="100000" wkbType="NoGeometry" styleCategories="AllStyleCategories" minScale="1e+08" autoRefreshEnabled="0">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12991,7 +12983,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" maxy="0" minz="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start/>
@@ -13016,138 +13008,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" startField="" enabled="0" fixedDuration="0" limitMode="0" durationField="" durationUnit="min" startExpression="">
         <fixedRange>
           <start/>
           <end/>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" clamping="Terrain" zoffset="0" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol is_animated="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="square" type="QString"/>
-                <Option name="customdash" value="5;2" type="QString"/>
-                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="customdash_unit" value="MM" type="QString"/>
-                <Option name="dash_pattern_offset" value="0" type="QString"/>
-                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
-                <Option name="draw_inside_polygon" value="0" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="line_color" value="243,166,178,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.6" type="QString"/>
-                <Option name="line_width_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MM" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="trim_distance_end" value="0" type="QString"/>
-                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
-                <Option name="trim_distance_start" value="0" type="QString"/>
-                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
-                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
-                <Option name="use_custom_dash" value="0" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol is_animated="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="243,166,178,255" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="offset" value="0,0" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MM" type="QString"/>
-                <Option name="outline_color" value="174,119,127,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.2" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol is_animated="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="243,166,178,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="diamond" type="QString"/>
-                <Option name="offset" value="0,0" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MM" type="QString"/>
-                <Option name="outline_color" value="174,119,127,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.2" type="QString"/>
-                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="3" type="QString"/>
-                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="size_unit" value="MM" type="QString"/>
-                <Option name="vertical_anchor_point" value="1" type="QString"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13156,18 +13148,18 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="copy" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option value="first_name" type="QString"/>
+          <Option 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="first_name"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" 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>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13185,8 +13177,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13209,8 +13201,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13233,8 +13225,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13276,19 +13268,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="day"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="first_name"/>
-        <alias name="" index="3" field="surname"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_phone"/>
-        <alias name="" index="9" field="race"/>
-        <alias name="" index="10" field="first_runner"/>
-        <alias name="" index="11" field="last_runner"/>
-        <alias name="" index="12" field="instructions"/>
+        <alias index="0" field="day" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="first_name" name=""/>
+        <alias index="3" field="surname" name=""/>
+        <alias index="4" field="club" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="race" name=""/>
+        <alias index="10" field="first_runner" name=""/>
+        <alias index="11" field="last_runner" name=""/>
+        <alias index="12" field="instructions" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="day"/>
@@ -13306,34 +13298,34 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="instructions"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="first_name" applyOnUpdate="0"/>
-        <default expression="" field="surname" applyOnUpdate="0"/>
-        <default expression="" field="club" 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="race" applyOnUpdate="0"/>
-        <default expression="" field="first_runner" applyOnUpdate="0"/>
-        <default expression="" field="last_runner" applyOnUpdate="0"/>
-        <default expression="" field="instructions" applyOnUpdate="0"/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="first_name" applyOnUpdate="0" expression=""/>
+        <default field="surname" applyOnUpdate="0" expression=""/>
+        <default field="club" applyOnUpdate="0" expression=""/>
+        <default field="phone" applyOnUpdate="0" expression=""/>
+        <default field="email" applyOnUpdate="0" expression=""/>
+        <default field="captain" applyOnUpdate="0" expression=""/>
+        <default field="captain_phone" applyOnUpdate="0" expression=""/>
+        <default field="race" applyOnUpdate="0" expression=""/>
+        <default field="first_runner" applyOnUpdate="0" expression=""/>
+        <default field="last_runner" applyOnUpdate="0" expression=""/>
+        <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="day"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="position"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_name"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="surname"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="club"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="phone"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="email"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain_phone"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="race"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_runner"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="last_runner"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="instructions"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="position" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="first_name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="surname" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="club" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="phone" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="email" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="captain" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="captain_phone" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="race" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="first_runner" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="last_runner" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="instructions" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="day" exp=""/>
@@ -13352,24 +13344,24 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="club" hidden="0" type="field"/>
-          <column width="-1" name="phone" hidden="0" type="field"/>
-          <column width="-1" name="email" hidden="0" type="field"/>
-          <column width="-1" name="captain" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="first_runner" hidden="0" type="field"/>
-          <column width="-1" name="last_runner" hidden="0" type="field"/>
-          <column width="-1" name="instructions" hidden="0" type="field"/>
-          <column width="-1" name="surname" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="first_name" hidden="0" type="field"/>
-          <column width="-1" name="race" hidden="0" type="field"/>
-          <column width="-1" name="captain_phone" hidden="0" type="field"/>
+          <column type="field" width="-1" name="position" hidden="0"/>
+          <column type="field" width="-1" name="club" hidden="0"/>
+          <column type="field" width="-1" name="phone" hidden="0"/>
+          <column type="field" width="-1" name="email" hidden="0"/>
+          <column type="field" width="-1" name="captain" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="first_runner" hidden="0"/>
+          <column type="field" width="-1" name="last_runner" hidden="0"/>
+          <column type="field" width="-1" name="instructions" hidden="0"/>
+          <column type="field" width="-1" name="surname" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="first_name" hidden="0"/>
+          <column type="field" width="-1" name="race" hidden="0"/>
+          <column type="field" width="-1" name="captain_phone" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13401,76 +13393,76 @@ 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_email"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="captain_phone"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="days"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="firstname"/>
-        <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="surname"/>
-        <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_email" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="captain_phone" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="days" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="firstname" 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="surname" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_email" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="captain_phone" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="days" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="firstname" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="surname" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_email"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="captain_phone"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="days"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="firstname"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="surname"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="captain" reuseLastValue="0"/>
-        <field name="captain_email" reuseLastValue="0"/>
-        <field name="captain_phone" reuseLastValue="0"/>
-        <field name="club" reuseLastValue="0"/>
-        <field name="days" reuseLastValue="0"/>
-        <field name="email" reuseLastValue="0"/>
-        <field name="first_runner" reuseLastValue="0"/>
-        <field name="firstname" reuseLastValue="0"/>
-        <field name="instructions" reuseLastValue="0"/>
-        <field name="last_runner" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="phone" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="surname" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="captain"/>
+        <field reuseLastValue="0" name="captain_email"/>
+        <field reuseLastValue="0" name="captain_phone"/>
+        <field reuseLastValue="0" name="club"/>
+        <field reuseLastValue="0" name="days"/>
+        <field reuseLastValue="0" name="email"/>
+        <field reuseLastValue="0" name="first_runner"/>
+        <field reuseLastValue="0" name="firstname"/>
+        <field reuseLastValue="0" name="instructions"/>
+        <field reuseLastValue="0" name="last_runner"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="phone"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="surname"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"/>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13536,7 +13528,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13561,326 +13553,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="141,90,153,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{743d2826-031c-45d5-809e-09f032abdd16}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13893,66 +13885,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13960,16 +13952,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13992,20 +13984,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="type"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -14013,13 +14005,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14051,12 +14043,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14064,7 +14056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14130,7 +14122,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14155,334 +14147,334 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="232,113,141,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="8.5" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.75" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="name" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8.5" fontWordSpacing="0" blendMode="0" textOpacity="0.75" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1.5" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1.5" bufferBlendMode="0" bufferDraw="1" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_x"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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 name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_y"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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 name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="2" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.20000000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="1" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="2" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="0.20000000000000001" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14490,16 +14482,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14510,8 +14502,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14520,8 +14512,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14530,8 +14522,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14540,8 +14532,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14550,8 +14542,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14560,8 +14552,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14570,8 +14562,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14580,8 +14572,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14590,23 +14582,23 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -14620,26 +14612,26 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="label_rota"/>
       </splitPolicies>
       <defaults>
-        <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"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="population" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="population" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="osm_id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="z_order" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="population" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_x" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_y" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_rota" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -14654,20 +14646,20 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" name="population" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="osm_id" hidden="0"/>
+          <column type="field" width="-1" name="name" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="z_order" hidden="0"/>
+          <column type="field" width="-1" name="population" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="label_x" hidden="0"/>
+          <column type="field" width="-1" name="label_y" hidden="0"/>
+          <column type="field" width="-1" name="label_rota" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14699,26 +14691,26 @@ 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 name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14726,7 +14718,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14792,7 +14784,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14817,374 +14809,374 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,158,23,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="7" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="7" fontWordSpacing="0" blendMode="0" textOpacity="0.80000000000000004" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="196,60,57,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" priority="3" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="3" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="4" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="5" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.29999999999999999" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="3" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="4" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MapUnit" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="5" mergeLines="1" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="0.29999999999999999" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="always_sho"/>
-                  <Option name="type" type="int" value="2"/>
+              <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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="&quot;&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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 name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15192,16 +15184,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15212,8 +15204,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15222,8 +15214,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15267,8 +15259,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15331,22 +15323,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
-        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="osm_id"/>
@@ -15367,40 +15359,40 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="auxiliary_storage_labeling_show"/>
       </splitPolicies>
       <defaults>
-        <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"/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="highway" applyOnUpdate="0" expression=""/>
+        <default field="waterway" applyOnUpdate="0" expression=""/>
+        <default field="aerialway" applyOnUpdate="0" expression=""/>
+        <default field="barrier" applyOnUpdate="0" expression=""/>
+        <default field="man_made" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="other_tags" applyOnUpdate="0" expression=""/>
+        <default field="never_show" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="always_sho" applyOnUpdate="0" expression=""/>
+        <default field="resident_a" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="highway" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="waterway" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="aerialway" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="barrier" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="man_made" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="other_tags" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="never_show" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="always_sho" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="resident_a" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_show" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="osm_id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="highway" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="waterway" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="aerialway" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="barrier" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="man_made" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="z_order" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="other_tags" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="never_show" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_x" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_y" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_rota" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="always_sho" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="resident_a" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="auxiliary_storage_labeling_show" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="osm_id" exp=""/>
@@ -15422,27 +15414,27 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="160" name="name" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="highway" hidden="0" type="field"/>
-          <column width="-1" name="waterway" hidden="0" type="field"/>
-          <column width="-1" name="aerialway" hidden="0" type="field"/>
-          <column width="-1" name="barrier" hidden="0" type="field"/>
-          <column width="-1" name="man_made" hidden="0" type="field"/>
-          <column width="175" name="other_tags" hidden="0" type="field"/>
-          <column width="-1" name="never_show" hidden="0" type="field"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
-          <column width="-1" name="always_sho" hidden="0" type="field"/>
-          <column width="-1" name="resident_a" hidden="0" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
+          <column type="field" width="-1" name="osm_id" hidden="0"/>
+          <column type="field" width="160" name="name" hidden="0"/>
+          <column type="field" width="-1" name="z_order" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="highway" hidden="0"/>
+          <column type="field" width="-1" name="waterway" hidden="0"/>
+          <column type="field" width="-1" name="aerialway" hidden="0"/>
+          <column type="field" width="-1" name="barrier" hidden="0"/>
+          <column type="field" width="-1" name="man_made" hidden="0"/>
+          <column type="field" width="175" name="other_tags" hidden="0"/>
+          <column type="field" width="-1" name="never_show" hidden="0"/>
+          <column type="field" width="-1" name="label_x" hidden="0"/>
+          <column type="field" width="-1" name="label_y" hidden="0"/>
+          <column type="field" width="-1" name="label_rota" hidden="0"/>
+          <column type="field" width="-1" name="always_sho" hidden="0"/>
+          <column type="field" width="-1" name="resident_a" hidden="0"/>
+          <column type="field" width="-1" name="auxiliary_storage_labeling_show" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15474,94 +15466,94 @@ 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 name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue>
-        <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"/>
+        <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"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15611,7 +15603,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15677,7 +15669,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15702,511 +15694,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="231,113,72,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <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}"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'" symbol="1"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'" symbol="2"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'" symbol="3"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'" symbol="4"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="name" type="QString" value="star"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.5"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,32,80,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/road_closure.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,12,254,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="255,255,255,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option 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>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="1"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option 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>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="5" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="43,153,41,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16215,183 +16207,183 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="name" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="2" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeRadiiY="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="2" bufferBlendMode="0" bufferDraw="1" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="1" shapeRotation="0" shapeRadiiY="2" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="2"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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 name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="2" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="3" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="3" xOffset="2" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" centroidWhole="0" polygonPlacementFlags="2" xOffset="2" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="3" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="10" scaleMin="0" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="2"/>
-                  <Option name="type" type="int" value="3"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16399,16 +16391,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16445,10 +16437,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -16457,16 +16449,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="distance"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -16476,15 +16468,15 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="name" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16516,16 +16508,16 @@ 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 name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16533,7 +16525,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16607,246 +16599,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
+            <layer pass="0" class="LinePatternFill" enabled="1" locked="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="135"/>
-                <Option name="clip_mode" type="QString" value="during_render"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="coordinate_reference" type="QString" value="feature"/>
-                <Option name="distance" type="QString" value="2"/>
-                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="distance_unit" type="QString" value="MM"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="line">
+              <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
+                <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
                   <Option type="Map">
-                    <Option name="align_dash_pattern" type="QString" value="0"/>
-                    <Option name="capstyle" type="QString" value="square"/>
-                    <Option name="customdash" type="QString" value="5;2"/>
-                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="customdash_unit" type="QString" value="MM"/>
-                    <Option name="dash_pattern_offset" type="QString" value="0"/>
-                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                    <Option name="draw_inside_polygon" type="QString" value="0"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="line_color" type="QString" value="211,134,33,255"/>
-                    <Option name="line_style" type="QString" value="solid"/>
-                    <Option name="line_width" type="QString" value="0.3"/>
-                    <Option name="line_width_unit" type="QString" value="MM"/>
-                    <Option name="offset" type="QString" value="0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="ring_filter" type="QString" value="0"/>
-                    <Option name="trim_distance_end" type="QString" value="0"/>
-                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                    <Option name="trim_distance_start" type="QString" value="0"/>
-                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                    <Option name="use_custom_dash" type="QString" value="0"/>
-                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.46"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="no"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16857,66 +16849,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16924,16 +16916,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16949,29 +16941,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="FID"/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="FID"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="FID" applyOnUpdate="0"/>
+        <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="FID" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="FID" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="431" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="431" name="type" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17003,12 +16995,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17016,7 +17008,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17082,7 +17074,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17107,612 +17099,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,207,80,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule label="No Parking" symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule label="Lane Closed" symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule label="One-Way" symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule label="Road Closures" symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" label="Road Open" symbol="0"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" label="No Parking" symbol="1"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" symbol="2"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" label="One-Way" symbol="3"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="2"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="1"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="2;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash dot dot"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{07696f80-e7db-403b-b380-82695a86ae34}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="3;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e24fa060-35e4-4c51-b944-426558636610}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17721,151 +17713,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="times" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="times" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{27379576-e711-4788-850d-75df56ba927b}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17873,16 +17865,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17919,10 +17911,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -17931,16 +17923,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="times"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="times" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="status" applyOnUpdate="0" expression=""/>
+        <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="status" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="times" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="status" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="times" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -17950,15 +17942,15 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="202" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="status" hidden="0" type="field"/>
-          <column width="-1" name="times" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="202" name="type" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="status" hidden="0"/>
+          <column type="field" width="-1" name="times" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17990,16 +17982,16 @@ 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 name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18007,7 +17999,1479 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
+      <extent>
+        <xmin>18.37579747691996346</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.89978161061302586</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37579747691996346</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.89978161061302586</ymax>
+      </wgs84extent>
+      <id>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>route_markers</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <dates/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="">memory</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <metadataUrls/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" 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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleLine" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
+              <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>
+              <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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+              <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>
+              <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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+              <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>
+              <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" forceraster="0" enableorderby="0"/>
+      <labeling type="rule-based">
+        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
+          <rule description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <settings calloutType="simple">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                <families/>
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                      <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>
+                      <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; ILIKE '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; ILIKE '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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+              <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <settings calloutType="simple">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                <families/>
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                      <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>
+                      <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; ILIKE '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; ILIKE '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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+              <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" filter="&quot;Source&quot; = '21KM'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="210,32,39,255" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,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>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" filter="&quot;Source&quot; = '10KM'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="103,34,144,255" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,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>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" filter="&quot;Source&quot; ILIKE '5KM%'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                        <Option type="Map">
+                          <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="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" filter="&quot;Source&quot; = 'Trail'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                        <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>
+                        <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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </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 backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
+          <axisSymbol>
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleLine" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+                <Option type="Map">
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                </Option>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
+        <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="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="Sort" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option 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="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>
+      </fieldConfiguration>
+      <aliases>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="begin" name=""/>
+        <alias index="2" field="end" name=""/>
+        <alias index="3" field="Distance" name=""/>
+        <alias index="4" field="RouteLen" name=""/>
+        <alias index="5" field="Sort" name=""/>
+        <alias index="6" field="day" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="length_m" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
+      </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+      </splitPolicies>
+      <defaults>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+      </defaults>
+      <constraints>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Sort" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="org_fid" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;">
+        <columns>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="org_fid" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="field" width="-1" name="Source" hidden="0"/>
+          <column type="field" width="-1" name="RouteLen" hidden="0"/>
+          <column type="field" width="-1" name="begin" hidden="0"/>
+          <column type="field" width="-1" name="end" hidden="0"/>
+          <column type="field" width="-1" name="Distance" hidden="0"/>
+          <column type="field" width="-1" name="length_km" hidden="0"/>
+          <column type="field" width="-1" name="Sort" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="length_m" 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 reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
+      </reuseLastValue>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+      <mapTip enabled="1">Text</mapTip>
+    </maplayer>
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.37568387427754857</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -18081,1020 +19545,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
+          <rule description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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; ILIKE '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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
+          <rule description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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; ILIKE '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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
+          <rule description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" filter="&quot;Source&quot; = '21KM'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="210,32,39,255" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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 name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
+            <rule description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" filter="&quot;Source&quot; = '10KM'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="103,34,144,255" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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 name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
+            <rule description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" filter="&quot;Source&quot; ILIKE '5KM%'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="190,178,151,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                          <Option 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="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
+            <rule description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" filter="&quot;Source&quot; = 'Trail'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="133,182,111,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                          <Option type="QString" name="angle" value="0"/>
+                          <Option type="QString" name="cap_style" value="square"/>
+                          <Option type="QString" name="color" value="133,182,111,255"/>
+                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                          <Option type="QString" name="joinstyle" value="bevel"/>
+                          <Option type="QString" name="name" value="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="0,72,255,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -19104,68 +20568,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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 name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19173,16 +20637,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19193,8 +20657,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19203,8 +20667,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19213,8 +20677,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19223,8 +20687,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19233,8 +20697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19257,8 +20721,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19267,8 +20731,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19277,8 +20741,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19287,8 +20751,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19297,8 +20761,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19312,19 +20776,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
-        <alias name="" index="12" field="quadrant"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="begin" name=""/>
+        <alias index="2" field="end" name=""/>
+        <alias index="3" field="Distance" name=""/>
+        <alias index="4" field="RouteLen" name=""/>
+        <alias index="5" field="Sort" name=""/>
+        <alias index="6" field="day" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="length_m" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
+        <alias index="12" field="quadrant" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -19342,34 +20806,34 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="quadrant"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="quadrant" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="quadrant" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Sort" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="org_fid" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="quadrant" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="Name" exp=""/>
@@ -19388,26 +20852,26 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
-          <column width="-1" name="Sort" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="quadrant" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="org_fid" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="field" width="-1" name="Source" hidden="0"/>
+          <column type="field" width="-1" name="RouteLen" hidden="0"/>
+          <column type="field" width="-1" name="descriptio" hidden="0"/>
+          <column type="field" width="-1" name="timestamp" hidden="0"/>
+          <column type="field" width="-1" name="begin" hidden="0"/>
+          <column type="field" width="-1" name="end" hidden="0"/>
+          <column type="field" width="-1" name="Distance" hidden="0"/>
+          <column type="field" width="-1" name="length_km" hidden="0"/>
+          <column type="field" width="-1" name="Sort" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="quadrant" hidden="0"/>
+          <column type="field" width="-1" name="length_m" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19439,1537 +20903,62 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <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"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
-      <extent>
-        <xmin>18.37569549706161354</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37569549706161354</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </wgs84extent>
-      <id>route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <dates/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
-              <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
-              <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
-              <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
-      <labeling type="rule-based">
-        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
-            <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
-            <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="190,178,151,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="133,182,111,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="0,72,255,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
-          <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
-                <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
-        <properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Sort" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
-      </aliases>
-      <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-      </splitPolicies>
-      <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
-        <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
-          <column width="-1" name="Sort" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="quadrant" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
-      </editable>
-      <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
-      </labelOnTop>
-      <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip enabled="1">Text</mapTip>
-    </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21043,173 +21032,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21220,16 +21209,16 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option 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 type="QString" value=""/>
         </activeChecks>
@@ -21261,9 +21250,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="area"/>
-        <alias name="" index="2" field="rotation"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -21271,14 +21260,14 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="rotation"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="area" applyOnUpdate="0" expression=""/>
+        <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="area" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="rotation" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="area" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="rotation" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -21287,14 +21276,14 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="area" hidden="0" type="field"/>
-          <column width="-1" name="rotation" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="area" hidden="0"/>
+          <column type="field" width="-1" name="rotation" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21317,21 +21306,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Point" simplifyMaxScale="1">
       <extent>
-        <xmin>18.38475260238231712</xmin>
-        <ymin>-33.92228210414224776</ymin>
+        <xmin>18.37527697005977245</xmin>
+        <ymin>-33.94584879231483399</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.9031231546964662</ymax>
+        <ymax>-33.89948351196304799</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.38475260238231712</xmin>
-        <ymin>-33.92228210414224776</ymin>
+        <xmin>18.37527697005977245</xmin>
+        <ymin>-33.94584879231483399</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.9031231546964662</ymax>
+        <ymax>-33.89948351196304799</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000'</datasource>
+      <datasource>./timelapse.shp|layername=timelapse</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21383,7 +21372,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21408,195 +21397,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule label="All distances" symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" checkstate="0" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" enabled="1" class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21608,70 +21597,70 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="StringList">
+          <Option type="QString" 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 name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21679,16 +21668,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21720,8 +21709,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21737,8 +21726,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21747,8 +21736,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21797,19 +21786,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="RouteLen"/>
-        <alias name="" index="6" field="Source"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="org_fid"/>
-        <alias name="" index="10" field="distance"/>
-        <alias name="" index="11" field="first_runn"/>
-        <alias name="" index="12" field="last_runne"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -21827,34 +21816,34 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="last_runne"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="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"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="first_runn" applyOnUpdate="0" expression=""/>
+        <default field="last_runne" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="descriptio" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="timestamp" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="first_runn" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="last_runne" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="descriptio" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="timestamp" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="org_fid" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="first_runn" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="last_runne" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="Name" exp=""/>
@@ -21873,24 +21862,24 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column width="179" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="first_runn" hidden="0" type="field"/>
-          <column width="-1" name="last_runne" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column type="field" width="179" name="begin" hidden="0"/>
+          <column type="field" width="-1" name="RouteLen" hidden="0"/>
+          <column type="field" width="-1" name="Source" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="field" width="-1" name="length_m" hidden="0"/>
+          <column type="field" width="-1" name="length_km" hidden="0"/>
+          <column type="field" width="-1" name="org_fid" hidden="0"/>
+          <column type="field" width="-1" name="first_runn" hidden="0"/>
+          <column type="field" width="-1" name="last_runne" hidden="0"/>
+          <column type="field" width="-1" name="descriptio" hidden="0"/>
+          <column type="field" width="-1" name="timestamp" hidden="0"/>
+          <column type="field" width="-1" name="end" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21922,58 +21911,58 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21981,7 +21970,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22055,326 +22044,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -22387,66 +22376,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22454,16 +22443,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22486,20 +22475,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="type"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -22507,13 +22496,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22545,12 +22534,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22558,7 +22547,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22632,291 +22621,291 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="15" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="label" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="15" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22924,16 +22913,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22956,20 +22945,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="label"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="label" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="label"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -22977,13 +22966,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="label" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="label" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23015,12 +23004,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -23028,7 +23017,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23094,7 +23083,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23119,267 +23108,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings calloutType="simple">
-              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="31,120,180,255" forcedBold="0" multilineHeight="1" namedStyle="Bold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="label" forcedBold="0" capitalization="0" isExpression="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="31,120,180,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Bold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="0.75" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,204" shapeOffsetUnit="MM" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeJoinStyle="64" shapeSizeY="0.29999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="0.75" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.75" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.75" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,204" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="-0.14999999999999999" shapeSizeType="0" shapeSizeY="0.29999999999999999" shapeRotation="0" shapeRadiiY="0.5" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,204"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.75"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="1" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" dist="0" xOffset="1" lineAnchorClipping="0" distUnits="MM" layerType="PolygonGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="6" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.76000000000000001" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="PolygonGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="1" polygonPlacementFlags="2" xOffset="1" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="5" scaleMin="1" labelPerPart="0" obstacleFactor="0.76000000000000001" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="6" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -23388,72 +23377,72 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23461,22 +23450,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -23487,8 +23476,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23497,8 +23486,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23507,8 +23496,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23529,11 +23518,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
-        <alias name="" index="3" field="races"/>
-        <alias name="" index="4" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -23543,18 +23532,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <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"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="table_set" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="table_set" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="races" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="table_set" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="races" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -23565,16 +23554,16 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="table_set" hidden="0" type="field"/>
-          <column width="-1" name="label" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="130" name="races" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="table_set" hidden="0"/>
+          <column type="field" width="-1" name="label" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="130" name="races" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23606,25 +23595,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="label" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="table_set" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="label"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="table_set"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -23658,9 +23647,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
     <layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
     <layer id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+    <layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -23829,7 +23818,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230907 - Gun Run 2023 - Marshal Plan 1.5.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230911 - Gun Run 2023 - Marshal Plan 1.7.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -23998,319 +23987,319 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option name="name" type="QString" value=""/>
+      <Option type="QString" name="name" value=""/>
       <Option name="properties"/>
-      <Option name="type" type="QString" value="collection"/>
+      <Option type="QString" name="type" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer visible="1" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" expanded="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 visible="1" expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer visible="1" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <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-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-      <expanded-legend-nodes id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <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-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer visible="1" expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer visible="1" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer visible="1" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -24340,83 +24329,83 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Marshals" printResolution="120" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshals">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24424,15 +24413,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" id="" positionLock="true" zValue="6" position="158.226,6.0007,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="184.8" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="132.391" excludeFromExports="0" positionOnPage="158.226,6.0007,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="132.391,187.018,mm" itemRotation="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="132.391" type="65647" zValue="6" position="158.226,6.0007,mm" opacity="1" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" groupUuid="" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" positionLock="true" size="132.391,187.018,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="184.8" positionOnPage="158.226,6.0007,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24440,15 +24429,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem symbolWidth="7" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="5" resizeToContents="1" frame="true" blendMode="0" positionOnPage="128.508,3.98741,mm" size="20.4703,32.2333,mm" background="true" groupUuid="" frameJoinStyle="bevel" position="128.508,3.98741,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="128" alpha="255" green="128" blue="128"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="128.508,3.98741,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="bevel" itemRotation="0" positionLock="true" zValue="5" outlineWidthM="0.1,mm" size="20.4703,32.2333,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="128.508,3.98741,mm" equalColumnWidth="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="128" blue="128" green="128"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24459,242 +24448,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.8805579999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.8805579999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="1" name="subgroup" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.1750019999999992" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="1" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.1750019999999992" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbol" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="3.8222239999999998" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="3.8222239999999998" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -24704,17 +24693,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -24722,166 +24711,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Inset map" positionLock="true" zValue="3" isTemporal="0" followPreset="true" mapRotation="0" position="98.7828,149.027,mm" blendMode="0" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.2,mm" excludeFromExports="0" positionOnPage="98.7828,149.027,mm" followPresetName="Marshal map - inset" type="65639" size="56.5192,54.5647,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" outlineWidthM="0.2,mm" drawCanvasItems="false" frame="true" type="65639" zValue="3" position="98.7828,149.027,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal map - inset" referencePoint="0" itemRotation="0" isTemporal="0" id="Inset map" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" positionLock="true" mapFlags="0" size="56.5192,54.5647,mm" visibility="1" positionOnPage="98.7828,149.027,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.39607548048533303" xmin="18.3917833749645645" ymin="-33.91073582826823696" ymax="-33.90659215121308279"/>
+        <Extent ymax="-33.90659215121308279" xmin="18.3917833749645645" ymin="-33.91073582826823696" xmax="18.39607548048533303"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24889,34 +24878,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" show="1">
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <ComposerMapOverview uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" inverted="0" blendMode="0" name="Overview 1" centered="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,65,170,127"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,102"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24924,9 +24913,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24934,173 +24923,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Main map" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="3.53,6.0007,mm" blendMode="0" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.53,6.0007,mm" followPresetName="Marshal map - main" type="65639" size="142,187.018,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="2" position="3.53,6.0007,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal map - main" referencePoint="0" itemRotation="0" isTemporal="0" id="Main map" background="false" blendMode="0" followPreset="true" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" positionLock="true" mapFlags="0" size="142,187.018,mm" visibility="1" positionOnPage="3.53,6.0007,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.3944429313991229" xmin="18.39341592405077463" ymin="-33.90934028818313095" ymax="-33.90798769129818879"/>
+        <Extent ymax="-33.90798769129818879" xmin="18.39341592405077463" ymin="-33.90934028818313095" xmax="18.3944429313991229"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25108,28 +25097,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="26.6623" zValue="1" anchorPoint="0" northMode="0" pictureRotation="0" position="246.665,178.41,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="246.665,178.41,mm" pictureWidth="47.1065" type="65640" size="47.1065,27.6,mm" file="../GunRun2023_500.png" itemRotation="0" resizeMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="26.6623" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="1" position="246.665,178.41,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="47.1065" northOffset="0" size="47.1065,27.6,mm" anchorPoint="0" visibility="1" file="../GunRun2023_500.png" positionOnPage="246.665,178.41,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25137,14 +25126,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" resizeMode="0" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
-        <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
+      <LayoutMultiFrame type="65648" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" maxBreakDistance="10" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25154,112 +25143,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="bool" value="true"/>
-          <Option name="imageCropMarginBottom" type="int" value="0"/>
-          <Option name="imageCropMarginLeft" type="int" value="0"/>
-          <Option name="imageCropMarginRight" type="int" value="0"/>
-          <Option name="imageCropMarginTop" type="int" value="0"/>
-          <Option name="imageCropMarginUnit" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="bool" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="rasterize" type="QString" value="false"/>
-          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
-          <Option name="singleFile" type="bool" value="false"/>
+          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
+          <Option type="int" name="forceVector" value="0"/>
+          <Option type="bool" name="imageAntialias" value="true"/>
+          <Option type="int" name="imageCropMarginBottom" value="0"/>
+          <Option type="int" name="imageCropMarginLeft" value="0"/>
+          <Option type="int" name="imageCropMarginRight" value="0"/>
+          <Option type="int" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropMarginUnit" value="0"/>
+          <Option type="bool" 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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option 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="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="bool" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" filterFeatures="0" sortKey="&quot;id&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" pageNameExpression="&quot;position&quot;" enabled="1" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" hideCoverage="0" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" pageNameExpression="&quot;position&quot;" filterFeatures="0" coverageLayerName="marshal_positions" sortKey="&quot;id&quot;" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25267,21 +25256,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" mode="0" id="" positionLock="true" pictureHeight="7.97477" zValue="4" anchorPoint="0" northMode="0" pictureRotation="330" position="286.027,2,mm" blendMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="286.027,2,mm" pictureWidth="6.31767" type="65640" size="9.45865,11,mm" file="arrows/NorthArrow_11.svg" itemRotation="0" resizeMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="7.97477" svgBorderColor="0,0,0,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65640" zValue="4" position="286.027,2,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="6.31767" northOffset="0" size="9.45865,11,mm" anchorPoint="0" visibility="1" file="arrows/NorthArrow_11.svg" positionOnPage="286.027,2,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25289,476 +25278,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="3" marginY="1" position="285.027,205.886,mm" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" referencePoint="0" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="285.027,205.886,mm" type="65641" htmlState="0" size="142.543,10.3185,mm" itemRotation="270" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="3" position="285.027,205.886,mm" opacity="1" labelText="[%upper( &quot;area&quot; )%]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="270" id="" background="false" blendMode="0" marginY="1" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" size="142.543,10.3185,mm" valign="64" visibility="1" positionOnPage="285.027,205.886,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="miter" numUnitsPerSegment="100" unitLabel="m" lineCapStyle="square" unitType="meters" height="3" labelBarSpace="3" positionLock="true" minBarWidth="50" labelVerticalPlacement="0" numSegments="4" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelHorizontalPlacement="0" segmentMillimeters="26.3519" style="Single Box" referencePoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="7,189.669,mm" size="145.54,16.2165,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.3" frameJoinStyle="miter" position="7,189.669,mm" visibility="1" excludeFromExports="0" boxContentSpace="1" subdivisionsHeight="1.5" alignment="0" maxBarWidth="150">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" numSegments="4" outlineWidth="0.3" type="65646" style="Single Box" positionOnPage="7,189.669,mm" boxContentSpace="1" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" id="" height="3" numSubdivisions="1" labelBarSpace="3" referencePoint="0" subdivisionsHeight="1.5" frameJoinStyle="miter" itemRotation="0" positionLock="true" unitLabel="m" zValue="2" outlineWidthM="0.3,mm" lineCapStyle="square" size="145.54,16.2165,mm" labelHorizontalPlacement="0" alignment="0" visibility="1" unitType="meters" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" labelVerticalPlacement="0" lineJoinStyle="miter" minBarWidth="50" groupUuid="" numUnitsPerSegment="100" position="7,189.669,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" background="false" blendMode="0" frame="false" segmentSizeMode="1" segmentMillimeters="26.3519">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" alpha="255" green="0" blue="0"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="invalid"/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="invalid"/>
+            <Option type="invalid" name="decimal_separator"/>
+            <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="invalid" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" alpha="255" green="0" blue="0"/>
-        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="330" position="7,5.5,mm" blendMode="0" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="7,5.5,mm" followPresetName="Start/Finish" type="65639" size="278.027,180.318,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="7,5.5,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Start/Finish" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="false" blendMode="0" followPreset="true" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" positionLock="true" mapFlags="0" size="278.027,180.318,mm" visibility="1" positionOnPage="7,5.5,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="rotation"/>
-                  <Option name="type" type="int" value="2"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="id"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="4" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="3" bottomAnnotationDisplay="3" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="5" unit="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25775,58 +25764,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25834,117 +25823,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
-          <Option name="svgCropMarginBottom" type="QString" value="0"/>
-          <Option name="svgCropMarginLeft" type="QString" value="0"/>
-          <Option name="svgCropMarginRight" type="QString" value="0"/>
-          <Option name="svgCropMarginTop" type="QString" value="0"/>
-          <Option name="svgCropToContents" type="QString" value="true"/>
-          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
-          <Option name="svgGroupLayers" type="QString" value="false"/>
-          <Option name="svgIncludeMetadata" type="QString" value="1"/>
-          <Option name="svgTextFormat" type="QString" value="0"/>
+          <Option 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 coverageLayerName="start_finish_area" filterFeatures="0" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" pageNameExpression="&quot;area&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" pageNameExpression="&quot;area&quot;" filterFeatures="0" coverageLayerName="start_finish_area" sortKey="area" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Cones" printResolution="300" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="300" name="Cones">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25952,15 +25941,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,67.2879,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="256.808,5.21277,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="11" outlineWidthM="0.3,mm" size="38.1563,67.2879,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="256.808,5.21277,mm" equalColumnWidth="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25971,242 +25960,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="group" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -26216,33 +26205,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" name="fencing" legend_exp="" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option name="legend/expressionFilter" type="QString" value=""/>
-                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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,4"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -26250,77 +26239,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="CONES: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="10" position="6.76779,191.188,mm" opacity="1" labelText="CONES: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" size="148.46,6.45211,mm" valign="32" visibility="1" positionOnPage="6.76779,191.188,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="56.3557" type="65647" zValue="9" position="182.723,191.188,mm" opacity="1" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" groupUuid="" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" positionLock="true" size="56.3557,6.45237,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="6.45237" positionOnPage="182.723,191.188,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26328,207 +26317,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="8" position="212.257,198.083,mm" opacity="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" size="26.8205,6.82826,mm" valign="32" visibility="1" positionOnPage="212.257,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="6" marginY="0" position="116.805,198.083,mm" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="116.805,198.083,mm" type="65641" htmlState="0" size="64.7594,7.10512,mm" itemRotation="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="6" position="116.805,198.083,mm" opacity="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" size="64.7594,7.10512,mm" valign="32" visibility="1" positionOnPage="116.805,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="52.7903,7.07327,mm" itemRotation="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="5" position="6.76779,198.083,mm" opacity="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" size="52.7903,7.07327,mm" valign="32" visibility="1" positionOnPage="6.76779,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="28.0105" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="4" position="243.098,175.353,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="49.3143" northOffset="0" size="49.3143,29.8354,mm" anchorPoint="8" visibility="1" file="../GunRun2023_250.png" positionOnPage="243.098,175.353,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26536,380 +26525,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="6.91779,197.79,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" size="232.01,0.14328,mm" visibility="1" positionOnPage="6.91779,197.79,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="500" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelHorizontalPlacement="0" segmentMillimeters="30.2878" style="Double Box" referencePoint="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="104.399,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" numSegments="2" outlineWidth="0.2" type="65646" style="Double Box" positionOnPage="6.76779,2.8482,mm" boxContentSpace="0.2" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" id="" height="2" numSubdivisions="1" labelBarSpace="1" referencePoint="0" subdivisionsHeight="1.5" frameJoinStyle="miter" itemRotation="0" positionLock="true" unitLabel="m" zValue="2" outlineWidthM="0.3,mm" lineCapStyle="square" size="104.399,15.8378,mm" labelHorizontalPlacement="0" alignment="0" visibility="1" unitType="meters" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" labelVerticalPlacement="0" lineJoinStyle="round" minBarWidth="25" groupUuid="" numUnitsPerSegment="500" position="6.76779,2.8482,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" background="false" blendMode="0" frame="false" segmentSizeMode="1" segmentMillimeters="30.2878">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" alpha="255" green="0" blue="0"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="invalid"/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="invalid"/>
+            <Option type="invalid" name="decimal_separator"/>
+            <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="invalid" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" alpha="255" green="0" blue="0"/>
-        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="6.76779,9.35102,mm" labelMargin="0,mm" opacity="0.9" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Fencing" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="false" blendMode="0" followPreset="true" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" positionLock="true" mapFlags="0" size="283.418,180.92,mm" visibility="1" positionOnPage="6.76779,9.35102,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" type="double" value="1"/>
-                      <Option name="maxOutput" type="double" value="360"/>
-                      <Option name="maxValue" type="double" value="0"/>
-                      <Option name="minOutput" type="double" value="0"/>
-                      <Option name="minValue" type="double" value="0"/>
-                      <Option name="nullOutput" type="double" value="0"/>
+              <Option 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 name="t" type="int" value="0"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option name="type" type="int" value="3"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40002634434715745" xmin="18.35799642373467222" ymin="-33.94965747213089458" ymax="-33.92282769675949083"/>
+        <Extent ymax="-33.92282769675948373" xmin="18.35799642373368457" ymin="-33.94965747213089458" xmax="18.4000263443481451"/>
         <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>
@@ -26924,92 +26913,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="4" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="3" bottomAnnotationDisplay="3" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="5" unit="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27026,58 +27015,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27085,21 +27074,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" url="" resizeMode="0" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
+      <LayoutMultiFrame type="65648" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" maxBreakDistance="10" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27109,250 +27098,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="rasterize" type="QString" value="true"/>
-          <Option name="singleFile" type="bool" value="true"/>
+          <Option 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="pdfExportGeoPdfFeatures" 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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+          <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="rasterize" value="true"/>
+          <Option type="bool" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="cone_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayerName="cone_groups" sortKey="&quot;group&quot;" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="9" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="9"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="8" marginY="1" position="4.43449,186.634,mm" blendMode="0" labelText="Directions to Start of Race" referencePoint="0" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,186.634,mm" type="65641" htmlState="0" size="83.9998,10.4638,mm" itemRotation="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="8" position="4.43449,186.634,mm" opacity="1" labelText="Directions to Start of Race" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" size="83.9998,10.4638,mm" valign="64" visibility="1" positionOnPage="4.43449,186.634,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="7" marginY="1" position="4.43449,197.498,mm" blendMode="0" labelText="Gun Run" referencePoint="0" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,197.498,mm" type="65641" htmlState="0" size="48.2923,9.511,mm" itemRotation="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="4.43449,197.498,mm" opacity="1" labelText="Gun Run" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" size="48.2923,9.511,mm" valign="32" visibility="1" positionOnPage="4.43449,197.498,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem symbolWidth="9" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="5" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="0" legendFilterByMap="1" positionLock="false" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="true" blendMode="0" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" background="true" groupUuid="" frameJoinStyle="round" position="10.096,10.8563,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="139" alpha="255" green="139" blue="139"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" legendFilterByMap="1" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="10.096,10.8563,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="round" itemRotation="0" positionLock="false" zValue="6" outlineWidthM="0.3,mm" size="59.0766,76,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorder="1" symbolWidth="9" wmsLegendWidth="50" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="10.096,10.8563,mm" equalColumnWidth="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="5" columnSpace="0" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="139" blue="139" green="139"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27363,242 +27352,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="7.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="16" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="7.6444479999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbolLabel" indent="0" marginLeft="3">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbolLabel" marginLeft="3">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27608,32 +27597,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Ask Me" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" type="QString" value="hidden"/>
+                <Option type="QString" name="legend/title-style" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" name="poi_labels" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
-                  <Option name="legend/label-1" type="QString" value="Toilets"/>
-                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
-                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
-                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
-                  <Option name="legend/label-5" type="QString" value="Parking"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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 legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" name="directions_to_start" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
-                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
-                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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>
@@ -27641,145 +27630,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="5" marginY="1" position="221.862,190.027,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="221.862,190.027,mm" type="65641" htmlState="0" size="27.7839,6.871,mm" itemRotation="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="221.862,190.027,mm" opacity="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" size="27.7839,6.871,mm" valign="32" visibility="1" positionOnPage="221.862,190.027,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="4" marginY="1" position="197.975,197.498,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="197.975,197.498,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="4" position="197.975,197.498,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" size="51.6706,6.60801,mm" valign="64" visibility="1" positionOnPage="197.975,197.498,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="false" pictureHeight="24.3824" zValue="3" anchorPoint="4" northMode="0" pictureRotation="0" position="249.646,179.724,mm" blendMode="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="249.646,179.724,mm" pictureWidth="24.2337" type="65640" size="42.9838,24.3824,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="24.3824" svgBorderColor="0,0,0,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65640" zValue="3" position="249.646,179.724,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" positionLock="false" svgFillColor="255,255,255,255" pictureWidth="24.2337" northOffset="0" size="42.9838,24.3824,mm" anchorPoint="4" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="249.646,179.724,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27787,85 +27776,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="false" zValue="2" position="4.58449,197.248,mm" blendMode="0" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" type="65643" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" itemRotation="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="2" position="4.58449,197.248,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" size="244.912,0.1,mm" visibility="1" positionOnPage="4.58449,197.248,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{25dc84af-8724-465b-a42c-c6c013132998}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="4.43449,6.411,mm" blendMode="0" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="4.43449,6.411,mm" followPresetName="Ask Me" type="65639" size="288.007,183.616,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="4.43449,6.411,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Ask Me" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" positionLock="false" mapFlags="0" size="288.007,183.616,mm" visibility="1" positionOnPage="4.43449,6.411,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
         <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>
@@ -27880,149 +27869,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28030,318 +28019,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option 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 filterFeatures="0" coverageLayer="" hideCoverage="0" pageNameExpression="" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" hideCoverage="0" sortFeatures="0" coverageLayer="" pageNameExpression="" filterFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" name="Routes" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" printResolution="144" name="Routes">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="13" marginY="0" position="200.171,199.082,mm" blendMode="0" labelText="REVISION 1.6" referencePoint="0" valign="32" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="200.171,199.082,mm" type="65641" htmlState="0" size="61.5373,6.8714,mm" itemRotation="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="13" position="200.171,199.082,mm" opacity="1" labelText="REVISION 1.7" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" size="61.5373,6.8714,mm" valign="32" visibility="1" positionOnPage="200.171,199.082,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="12" marginY="0" position="9.7863,192.073,mm" blendMode="0" labelText="Gun Run 2023: [%&quot;Source&quot;%]" referencePoint="0" valign="64" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,192.073,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="12" position="9.7863,192.073,mm" opacity="1" labelText="Gun Run 2023: [%&quot;Source&quot;%]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" size="61.5373,6.60801,mm" valign="64" visibility="1" positionOnPage="9.7863,192.073,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="11" marginY="0" position="9.7863,199.082,mm" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" referencePoint="0" valign="32" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,199.082,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="11" position="9.7863,199.082,mm" opacity="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" size="61.5373,6.60801,mm" valign="32" visibility="1" positionOnPage="9.7863,199.082,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="16.8993" zValue="10" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="29.7523" type="65640" size="29.7523,17.4718,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="16.8993" svgBorderColor="0,0,0,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" type="65640" zValue="10" position="262.196,188.218,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="29.7523" northOffset="0" size="29.7523,17.4718,mm" anchorPoint="4" visibility="1" file="../GunRun2023_250.png" positionOnPage="262.196,188.218,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28349,374 +28338,374 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="9" position="9.57644,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.57644,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" itemRotation="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="9" position="9.57644,198.832,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" size="251.982,0.1,mm" visibility="1" positionOnPage="9.57644,198.832,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Finish" positionLock="true" zValue="8" isTemporal="0" followPreset="true" mapRotation="0" position="8.21644,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="8.21644,4.09761,mm" followPresetName="Routes" type="65639" size="109.221,188.689,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" outlineWidthM="0.3,mm" drawCanvasItems="true" frame="true" type="65639" zValue="8" position="8.21644,4.09761,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Trail Finish" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" keepLayerSet="false" positionLock="true" mapFlags="0" size="109.221,188.689,mm" visibility="1" positionOnPage="8.21644,4.09761,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93242806047424409" ymax="-33.90007966676468953"/>
+        <Extent ymax="-33.90007966676468953" xmin="18.39314911415855391" ymin="-33.93242806047424409" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Start" positionLock="true" zValue="7" isTemporal="0" followPreset="true" mapRotation="0" position="113.002,2.39423,mm" blendMode="0" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="113.002,2.39423,mm" followPresetName="Routes" type="65639" size="179.156,191.505,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" outlineWidthM="0.3,mm" drawCanvasItems="true" frame="true" type="65639" zValue="7" position="113.002,2.39423,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Trail Start" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" keepLayerSet="false" positionLock="true" mapFlags="0" size="179.156,191.505,mm" visibility="1" positionOnPage="113.002,2.39423,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95791657202656921" ymax="-33.92465573363980269"/>
+        <Extent ymax="-33.92465573363980269" xmin="18.3924263991010406" ymin="-33.95791657202656921" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Left inset 21KM" positionLock="true" zValue="6" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="true" type="65639" zValue="6" position="5.86559,4.09761,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Left inset 21KM" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" positionLock="true" mapFlags="0" size="67.7828,166.874,mm" visibility="1" positionOnPage="5.86559,4.09761,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Bottom inset 21KM" positionLock="true" zValue="5" isTemporal="0" followPreset="true" mapRotation="0" position="131.391,120.702,mm" blendMode="0" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="131.391,120.702,mm" followPresetName="Routes" type="65639" size="113.3,76.1023,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true">
-        <FrameColor red="103" alpha="255" green="34" blue="144"/>
-        <BackgroundColor red="200" alpha="128" green="175" blue="215"/>
+      <LayoutItem templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" outlineWidthM="0.3,mm" drawCanvasItems="true" frame="true" type="65639" zValue="5" position="131.391,120.702,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Bottom inset 21KM" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" keepLayerSet="false" positionLock="true" mapFlags="0" size="113.3,76.1023,mm" visibility="1" positionOnPage="131.391,120.702,mm">
+        <FrameColor alpha="255" red="103" blue="144" green="34"/>
+        <BackgroundColor alpha="128" red="200" blue="215" green="175"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Main Map" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="8.14144,4.02261,mm" blendMode="0" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="8.14144,4.02261,mm" followPresetName="Routes" type="65639" size="282.732,188.839,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.15,mm" drawCanvasItems="true" frame="true" type="65639" zValue="1" position="8.14144,4.02261,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="round" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Main Map" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" positionLock="true" mapFlags="0" size="282.732,188.839,mm" visibility="1" positionOnPage="8.14144,4.02261,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 '10500'&#xa;WHEN &quot;Source&quot; ILIKE '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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymin="-33.92600000000000193" ymax="-33.8918539481981469"/>
+        <Extent ymax="-33.8918539481981469" xmin="18.37199999999999989" ymin="-33.92600000000000193" xmax="18.42312398088981951"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28724,40 +28713,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" show="1">
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <ComposerMapOverview uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1" inverted="0" blendMode="0" name="Overview 1" centered="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="alpha" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="103,34,144,26"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28765,9 +28754,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28775,115 +28764,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option 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~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+          <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 coverageLayerName="all_routes" filterFeatures="1" sortKey="&quot;Sort&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" enabled="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" coverageLayerProvider="ogr" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortFeatures="1"/>
+      <Atlas sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" hideCoverage="0" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" pageNameExpression="&quot;Distance&quot;" filterFeatures="1" coverageLayerName="all_routes" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" printResolution="120" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan A1">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="594,841,mm" itemRotation="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" size="594,841,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28891,15 +28880,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="8" resizeToContents="1" frame="false" blendMode="0" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" background="true" groupUuid="" frameJoinStyle="miter" position="25.5925,18.7971,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="25.5925,18.7971,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="8" outlineWidthM="0.3,mm" size="4,4,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="25.5925,18.7971,mm" equalColumnWidth="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="false" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28910,242 +28899,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="16" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.6444479999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="1" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="1" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbol" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29155,17 +29144,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" checked="Qt::Checked" legend_exp="" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes20170907054841602" name="all_routes" legend_exp="">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="QString" value="0"/>
+                  <Option 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>
@@ -29173,207 +29162,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.2963,808.939,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="5.2963,808.939,mm" type="65641" htmlState="0" size="91.9494,15.0649,mm" itemRotation="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="5.2963,808.939,mm" opacity="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" size="91.9494,15.0649,mm" valign="64" visibility="1" positionOnPage="5.2963,808.939,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="430.403,825.052,mm" blendMode="0" labelText="REVISION 1.2" referencePoint="0" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="430.403,825.052,mm" type="65641" htmlState="0" size="56.6212,15.3656,mm" itemRotation="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="430.403,825.052,mm" opacity="1" labelText="REVISION 1.2" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" size="56.6212,15.3656,mm" valign="32" visibility="1" positionOnPage="430.403,825.052,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="4" marginY="1" position="372.175,808.942,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="372.175,808.942,mm" type="65641" htmlState="0" size="114.848,15.0635,mm" itemRotation="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="4" position="372.175,808.942,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" size="114.848,15.0635,mm" valign="64" visibility="1" positionOnPage="372.175,808.942,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="63.9757" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="489.557,775.395,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="489.557,775.395,mm" pictureWidth="63.5856" type="65640" size="100.498,63.9757,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="63.9757" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="3" position="489.557,775.395,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="63.5856" northOffset="0" size="100.498,63.9757,mm" anchorPoint="8" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="489.557,775.395,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29381,199 +29370,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.4463,824.155,mm" blendMode="0" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" type="65643" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" itemRotation="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="2" position="5.4463,824.155,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" size="481.428,0.606138,mm" visibility="1" positionOnPage="5.4463,824.155,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="3.94474,5.25965,mm" blendMode="0" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.94474,5.25965,mm" followPresetName="Marshal plan" type="65639" size="584.759,811.213,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="true" type="65639" zValue="1" position="3.94474,5.25965,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal plan" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" positionLock="true" mapFlags="0" size="584.759,811.213,mm" visibility="1" positionOnPage="3.94474,5.25965,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option 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 coverageLayerName="complete_marshal_overview" filterFeatures="0" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayerName="complete_marshal_overview" sortKey="page" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="144" name="Access Roads">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="15" resizeToContents="1" frame="true" blendMode="0" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" background="true" groupUuid="" frameJoinStyle="miter" position="244.484,130.172,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="185" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="244.484,130.172,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="15" outlineWidthM="0.3,mm" size="34.45,40.8,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="244.484,130.172,mm" equalColumnWidth="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="185" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29581,242 +29570,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="group" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29826,15 +29815,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Residents Access" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Residents Access" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" name="residents_access_roads" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29842,207 +29831,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" referencePoint="0" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="8" position="9.37446,191.81,mm" opacity="1" labelText="ACCESS ROUTES FOR RESIDENTS" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" size="194.851,7.272,mm" valign="64" visibility="1" positionOnPage="9.37446,191.81,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.1" referencePoint="0" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="6" position="204.225,191.81,mm" opacity="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" size="57.4836,6.8714,mm" valign="64" visibility="1" positionOnPage="204.225,191.81,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="210.038,199.082,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" size="51.6706,6.60801,mm" valign="64" visibility="1" positionOnPage="210.038,199.082,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="17.4718" svgBorderColor="0,0,0,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" type="65640" zValue="4" position="262.196,188.218,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="17.3653" northOffset="0" size="29.7523,17.4718,mm" anchorPoint="4" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30050,100 +30039,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="9.59946,198.832,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" size="251.959,0.1,mm" visibility="1" positionOnPage="9.59946,198.832,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Access Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="true" type="65639" zValue="2" position="5.86559,4.09761,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Access Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" positionLock="true" mapFlags="0" size="67.7828,166.874,mm" visibility="1" positionOnPage="5.86559,4.09761,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
         <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>
@@ -30158,149 +30147,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30308,45 +30297,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,9.08557,mm" followPresetName="Access Routes" type="65639" size="282.012,175.592,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.15,mm" drawCanvasItems="false" frame="true" type="65639" zValue="1" position="9.44946,9.08557,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="round" excludeFromExports="0" followPresetName="Access Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" positionLock="true" mapFlags="0" size="282.012,175.592,mm" visibility="1" positionOnPage="9.44946,9.08557,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
         <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>
@@ -30361,149 +30350,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30511,318 +30500,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option 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 coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" hideCoverage="1" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayerName="residents_access" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="Access to P9 Parking and VIP Tent" referencePoint="0" valign="64" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="8" position="9.37446,191.81,mm" opacity="1" labelText="Access to P9 Parking and VIP Tent" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" size="194.851,7.272,mm" valign="64" visibility="1" positionOnPage="9.37446,191.81,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="64" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="6" position="204.225,191.81,mm" opacity="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" size="57.4836,6.8714,mm" valign="64" visibility="1" positionOnPage="204.225,191.81,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="210.038,199.082,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" size="51.6706,6.60801,mm" valign="64" visibility="1" positionOnPage="210.038,199.082,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="17.4718" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="4" position="262.196,188.218,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="17.3653" northOffset="0" size="29.7523,17.4718,mm" anchorPoint="4" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30830,85 +30819,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="9.59946,198.832,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" size="251.959,0.1,mm" visibility="1" positionOnPage="9.59946,198.832,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{025604c1-b118-4f15-b140-54c9145260c4}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="false" mapRotation="0" position="9.44946,7.25098,mm" blendMode="0" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" frame="false" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,7.25098,mm" followPresetName="" type="65639" size="282.012,182.649,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" outlineWidthM="0.15,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="9.44946,7.25098,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="round" excludeFromExports="0" followPresetName="" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="false" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" keepLayerSet="false" positionLock="false" mapFlags="0" size="282.012,182.649,mm" visibility="1" positionOnPage="9.44946,7.25098,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
         <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>
@@ -30923,149 +30912,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31073,108 +31062,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option 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 coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" hideCoverage="1" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayerName="residents_access" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" printResolution="120" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,420,mm" itemRotation="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" size="297,420,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31182,15 +31171,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" id="" positionLock="true" zValue="9" position="112.086,406.476,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="8.3142" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="23.5967" excludeFromExports="0" positionOnPage="112.086,406.476,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="23.5967,8.3142,mm" itemRotation="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="23.5967" type="65647" zValue="9" position="112.086,406.476,mm" opacity="1" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" groupUuid="" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" positionLock="true" size="23.5967,8.3142,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="8.3142" positionOnPage="112.086,406.476,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31198,139 +31187,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="1" position="214.292,406.874,mm" blendMode="0" labelText="REVISION 1.4" referencePoint="0" valign="32" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="214.292,406.874,mm" type="65641" htmlState="0" size="27.7839,7.51682,mm" itemRotation="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="8" position="214.292,406.874,mm" opacity="1" labelText="REVISION 1.7" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" size="27.7839,7.51682,mm" valign="32" visibility="1" positionOnPage="214.292,406.874,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.69321,398.344,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="5.69321,398.344,mm" type="65641" htmlState="0" size="45.1194,8.13137,mm" itemRotation="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="5.69321,398.344,mm" opacity="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" size="45.1194,8.13137,mm" valign="64" visibility="1" positionOnPage="5.69321,398.344,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem symbolWidth="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="false" blendMode="0" positionOnPage="15.6525,12.5708,mm" size="22.2406,33.2917,mm" background="true" groupUuid="" frameJoinStyle="miter" position="15.6525,12.5708,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="15.6525,12.5708,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="6" outlineWidthM="0.3,mm" size="22.2406,33.2917,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="15.6525,12.5708,mm" equalColumnWidth="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="false" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31341,242 +31330,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="16" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.6444479999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="1" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="1" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbol" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -31586,19 +31575,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" type="QString" value="group"/>
+                <Option type="QString" name="legend/title-style" value="group"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -31606,15 +31595,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" id="" positionLock="true" zValue="5" position="5.69321,406.988,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.80192" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="118.192" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="118.192,7.80192,mm" itemRotation="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="118.192" type="65647" zValue="5" position="5.69321,406.988,mm" opacity="1" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" groupUuid="" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" positionLock="true" size="118.192,7.80192,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="7.80192" positionOnPage="5.69321,406.988,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31622,15 +31611,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" id="" positionLock="true" zValue="4" position="148.501,398.344,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="8.13167" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="93.5757" excludeFromExports="0" positionOnPage="148.501,398.344,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="93.5757,8.13167,mm" itemRotation="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="93.5757" type="65647" zValue="4" position="148.501,398.344,mm" opacity="1" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" groupUuid="" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" positionLock="true" size="93.5757,8.13167,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="8.13167" positionOnPage="148.501,398.344,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31638,21 +31627,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="27.9119" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="243.319,382.696,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.319,382.696,mm" pictureWidth="49.3143" type="65640" size="49.3143,31.2967,mm" file="../../Gun Run 2023.png" itemRotation="0" resizeMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="27.9119" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="3" position="243.319,382.696,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="49.3143" northOffset="0" size="49.3143,31.2967,mm" anchorPoint="8" visibility="1" file="../../Gun Run 2023.png" positionOnPage="243.319,382.696,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31660,101 +31649,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.84321,406.626,mm" blendMode="0" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" type="65643" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" itemRotation="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="2" position="5.84321,406.626,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" size="236.083,0.14328,mm" visibility="1" positionOnPage="5.84321,406.626,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="5.03,5.9483,mm" blendMode="0" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.03,5.9483,mm" followPresetName="Marshal plan" type="65639" size="286.94,392.396,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="5.03,5.9483,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal plan" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" keepLayerSet="false" positionLock="true" mapFlags="0" size="286.94,392.396,mm" visibility="1" positionOnPage="5.03,5.9483,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016832226" ymax="-33.9248732774534929"/>
+        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" url="" resizeMode="0" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" contentMode="1" html="Page [% &quot;page&quot; %] " maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
-        <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
+      <LayoutMultiFrame type="65648" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" maxBreakDistance="10" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="Page [% &quot;page&quot; %] " resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31762,14 +31751,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" url="" resizeMode="0" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
-        <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
+      <LayoutMultiFrame type="65648" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" maxBreakDistance="10" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31777,14 +31766,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" url="" resizeMode="0" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
+      <LayoutMultiFrame type="65648" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" maxBreakDistance="10" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31794,99 +31783,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option 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~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+          <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 coverageLayerName="marshal_overviews" filterFeatures="0" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayerName="marshal_overviews" sortKey="page" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" printResolution="300" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="300" name="Fencing">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31894,15 +31883,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,68.0108,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="256.808,5.21277,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="11" outlineWidthM="0.3,mm" size="38.1563,68.0108,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="256.808,5.21277,mm" equalColumnWidth="1" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31913,242 +31902,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="group" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -32158,33 +32147,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" name="fencing" legend_exp="" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option name="legend/expressionFilter" type="QString" value=""/>
-                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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,4"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -32192,77 +32181,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="10" position="6.76779,191.188,mm" opacity="1" labelText="FENCING: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionLock="true" size="148.46,6.45211,mm" valign="32" visibility="1" positionOnPage="6.76779,191.188,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="56.3557" type="65647" zValue="9" position="182.723,191.188,mm" opacity="1" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" groupUuid="" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" positionLock="true" size="56.3557,6.45237,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="6.45237" positionOnPage="182.723,191.188,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32270,207 +32259,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="8" position="212.258,198.083,mm" opacity="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionLock="true" size="26.8205,6.82826,mm" valign="32" visibility="1" positionOnPage="212.258,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="62.6706,198.083,mm" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="62.6706,198.083,mm" type="65641" htmlState="0" size="51.1638,7.07327,mm" itemRotation="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="62.6706,198.083,mm" opacity="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionLock="true" size="51.1638,7.07327,mm" valign="32" visibility="1" positionOnPage="62.6706,198.083,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="90.2083,7.07327,mm" itemRotation="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="5" position="6.76779,198.083,mm" opacity="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionLock="true" size="90.2083,7.07327,mm" valign="32" visibility="1" positionOnPage="6.76779,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="28.0105" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="4" position="243.098,175.353,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="49.3143" northOffset="0" size="49.3143,29.8354,mm" anchorPoint="8" visibility="1" file="../GunRun2023_250.png" positionOnPage="243.098,175.353,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32478,380 +32467,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="6.91779,197.79,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" size="232.01,0.14328,mm" visibility="1" positionOnPage="6.91779,197.79,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="20" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" labelHorizontalPlacement="0" segmentMillimeters="25.8173" style="Double Box" referencePoint="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="87.2133,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" numSegments="2" outlineWidth="0.2" type="65646" style="Double Box" positionOnPage="6.76779,2.8482,mm" boxContentSpace="0.2" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" id="" height="2" numSubdivisions="1" labelBarSpace="1" referencePoint="0" subdivisionsHeight="1.5" frameJoinStyle="miter" itemRotation="0" positionLock="true" unitLabel="m" zValue="2" outlineWidthM="0.3,mm" lineCapStyle="square" size="87.2133,15.8378,mm" labelHorizontalPlacement="0" alignment="0" visibility="1" unitType="meters" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" opacity="1" labelVerticalPlacement="0" lineJoinStyle="round" minBarWidth="25" groupUuid="" numUnitsPerSegment="20" position="6.76779,2.8482,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" excludeFromExports="0" background="false" blendMode="0" frame="false" segmentSizeMode="1" segmentMillimeters="25.8173">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" alpha="255" green="0" blue="0"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="invalid"/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="invalid"/>
+            <Option type="invalid" name="decimal_separator"/>
+            <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="invalid" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" alpha="255" green="0" blue="0"/>
-        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ba8b697f-af10-49bc-b789-55678d099479}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="6.76779,9.35102,mm" labelMargin="0,mm" opacity="0.9" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Fencing" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="false" blendMode="0" followPreset="true" mapRotation="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" keepLayerSet="false" positionLock="true" mapFlags="0" size="283.418,180.92,mm" visibility="1" positionOnPage="6.76779,9.35102,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" type="double" value="1"/>
-                      <Option name="maxOutput" type="double" value="360"/>
-                      <Option name="maxValue" type="double" value="0"/>
-                      <Option name="minOutput" type="double" value="0"/>
-                      <Option name="minValue" type="double" value="0"/>
-                      <Option name="nullOutput" type="double" value="0"/>
+              <Option 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 name="t" type="int" value="0"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option name="type" type="int" value="3"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.37821516684363488" xmin="18.37624285840067628" ymin="-33.94258732662760991" ymax="-33.94132830492694808"/>
+        <Extent ymax="-33.94132830492694808" xmin="18.37624285840067628" ymin="-33.94258732662760991" xmax="18.37821516684363488"/>
         <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>
@@ -32866,92 +32855,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="4" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="3" bottomAnnotationDisplay="3" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="5" unit="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -32968,58 +32957,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33027,21 +33016,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" url="" resizeMode="0" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
+      <LayoutMultiFrame type="65648" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" maxBreakDistance="10" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33051,38 +33040,38 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="rasterize" type="QString" value="true"/>
-          <Option name="singleFile" type="bool" value="true"/>
+          <Option 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="pdfExportGeoPdfFeatures" 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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+          <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="rasterize" value="true"/>
+          <Option type="bool" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayerName="fence_groups" sortKey="&quot;group&quot;" coverageLayerProvider="virtual"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <Sensors/>
-  <ProjectViewSettings rotation="0" UseProjectScales="0">
+  <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.43564544749748535" xmin="18.38044081847287714" ymin="-33.91875794015667367" ymax="-33.88880497692461091">
+    <DefaultViewExtent ymax="-33.90684867733166641" xmin="18.40541208561092645" ymin="-33.90836307879926892" xmax="18.40820319414218176">
       <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>
@@ -33099,7 +33088,7 @@ def my_form_open(dialog, layer, feature):
   <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings frameRate="1" timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
+  <ProjectTimeSettings timeStep="1" frameRate="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
@@ -33108,29 +33097,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option name="decimal_separator" type="invalid"/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="direction_format" type="int" value="0"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="invalid"/>
+        <Option type="invalid" name="decimal_separator"/>
+        <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="invalid" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
-        <Option name="decimal_separator" type="invalid"/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
-        <Option name="show_leading_zeros" type="bool" value="false"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_suffix" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="invalid"/>
+        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
+        <Option type="invalid" name="decimal_separator"/>
+        <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="invalid" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
     <CoordinateCustomCrs>
@@ -33147,7 +33136,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" destinationFollowsActiveLayer="1" autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayerProvider="memory" destinationLayer="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" destinationLayerName="route_markers">
+  <ProjectGpsSettings autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayerName="marshal_positions" destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" destinationFollowsActiveLayer="1" destinationLayerProvider="ogr" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 40f9397..bf86206 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 saveUserFull="Timothy Allen" version="3.32.2-Lima" saveUser="tim" saveDateTime="2023-09-07T23:11:15" projectname="Gun Run">
+<qgis version="3.32.2-Lima" saveUserFull="Timothy Allen" saveDateTime="2023-09-11T14:41:57" projectname="Gun Run" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,255 +17,256 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer edl-distance-unit="0" edl-strength="1000" light-altitude="45" edl-distance="0.5" hillshading-is-active="0" combined-method="0" hillshading-is-multidirectional="0" edl-is-active="1" is-active="0" hillshading-z-factor="1" light-azimuth="315"/>
+  <elevation-shading-renderer edl-distance-unit="0" combined-method="0" light-altitude="45" hillshading-is-active="0" hillshading-is-multidirectional="0" edl-distance="0.5" edl-is-active="1" edl-strength="1000" light-azimuth="315" is-active="0" hillshading-z-factor="1"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" name="Marshals" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Marshals" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshal_positions" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" name="marshal_positions" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-            <Option name="showFeatureCount" type="int" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <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 legend_split_behavior="0" expanded="1" patch_size="0,0" name="extra_security" source="./extra_security.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="extra_security20170921130834191">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="extra_security20170921130834191" providerKey="ogr" name="extra_security" legend_exp="" source="./extra_security.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="marshals_by_position" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_exp="" providerKey="delimitedtext" id="marshals_by_position20161003112326575">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="marshals_by_position20161003112326575" providerKey="delimitedtext" name="marshals_by_position" legend_exp="" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" type="int" value="1"/>
+            <Option type="int" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="complete_marshal_overview" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" name="complete_marshal_overview" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="marshal_overviews" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" name="marshal_overviews" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews">
         <customproperties>
           <Option type="Map">
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <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" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" name="fencing" legend_exp="" source="./fencing.shp|layername=fencing">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option name="legend/expressionFilter" type="QString" value=""/>
-            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option 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 legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" name="cone_groups" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" name="fence_groups" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="fence_and_cone_groups" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_exp="" providerKey="virtual" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" providerKey="virtual" name="fence_and_cone_groups" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" name="Markers" groupLayer="" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" expanded="1" name="Markers" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" checked="Qt::Checked" legend_exp="" providerKey="memory" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549">
+        <layer-tree-layer checked="Qt::Checked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" providerKey="memory" name="route_markers" legend_exp="" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={cfc41d11-3570-4946-909c-43636e49a7a2}">
           <customproperties>
             <Option type="Map">
-              <Option name="showFeatureCount" type="int" value="1"/>
+              <Option type="invalid" name="expandedLegendNodes"/>
+              <Option type="int" name="showFeatureCount" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
-        <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="-1,-1" name="route_markers" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={458fbc48-5594-4b39-9810-4ac65744537d}" checked="Qt::Unchecked" legend_exp="" providerKey="memory" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02">
+        <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" expanded="1" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" providerKey="memory" name="route_markers" legend_exp="" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={97392ca3-9c79-4882-9d0f-3902063831df}">
           <customproperties>
             <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option name="showFeatureCount" type="int" value="1"/>
+              <Option type="invalid" name="expandedLegendNodes"/>
+              <Option type="int" name="showFeatureCount" value="1"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="int" value="0"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" name="showFeatureCount" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="timelapse" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f">
+    <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" name="timelapse" legend_exp="" source="./timelapse.shp|layername=timelapse">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" name="Feeding Stations" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Feeding Stations" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="water_tables" source="./water_tables.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="water_tables20170921142016467">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="water_tables20170921142016467" providerKey="ogr" name="water_tables" legend_exp="" source="./water_tables.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" name="Ask Me" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Ask Me" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" name="poi_labels" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" name="directions_to_start" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" name="Residents Access" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Residents Access" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="mayor" source="./mayor.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" name="mayor" legend_exp="" source="./mayor.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="viplabels" source="./viplabels.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" name="viplabels" legend_exp="" source="./viplabels.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="vipaccess" source="./vipaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" name="vipaccess" legend_exp="" source="./vipaccess.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="golfaccess" source="./golfaccess.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" name="golfaccess" legend_exp="" source="./golfaccess.shp">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" name="residents_access_roads" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" name="residents_access" legend_exp="" source="./residents_access.shp|layername=residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="OSM data" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="OSM data" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="osm_roads" source="./osm_roads.shp" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" name="osm_roads" legend_exp="" source="./osm_roads.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="osm_places" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" name="osm_places" legend_exp="" source="./osm_places.shp|layername=osm_places">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="Start and Finish pages" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Start and Finish pages" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="data-comments" source="./data-comments.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" name="data-comments" legend_exp="" source="./data-comments.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="start_finish_area" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" name="start_finish_area" legend_exp="" source="./start_finish_area.shp">
         <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" name="Elevation" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Elevation" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="capetownelevation-1m" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_exp="" providerKey="ogr" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1">
+      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" name="capetownelevation-1m" legend_exp="" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="showFeatureCount" type="QString" value="1"/>
+            <Option type="QString" name="showFeatureCount" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" name="Map" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Map" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_split_behavior="0" expanded="0" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" legend_exp="" providerKey="gdal" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="Outlines" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_exp="" providerKey="wms" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d">
+      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" name="Outlines" legend_exp="" 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">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -296,39 +297,39 @@
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
-      <item>route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02</item>
       <item>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</item>
       <item>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</item>
+      <item>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings self-snapping="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" tolerance="10" enabled="0" maxScale="0" type="1" unit="1">
+  <snapping-settings mode="3" type="1" unit="1" enabled="0" tolerance="10" intersection-snapping="1" scaleDependencyMode="0" self-snapping="1" maxScale="0" minScale="0">
     <individual-layer-settings>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="0" units="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="water_tables20170921142016467"/>
-      <layer-setting minScale="0" tolerance="0" enabled="0" maxScale="0" type="2" units="2" id="extra_security20170921130834191"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-      <layer-setting minScale="0" tolerance="20" enabled="1" maxScale="0" type="2" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="1" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer-setting minScale="0" tolerance="12" enabled="0" maxScale="0" type="2" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" minScale="0"/>
+      <layer-setting type="0" units="1" enabled="0" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="2" enabled="0" tolerance="0" id="extra_security20170921130834191" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" minScale="0"/>
+      <layer-setting type="0" units="1" enabled="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" maxScale="0" minScale="0"/>
+      <layer-setting type="1" units="1" enabled="0" tolerance="12" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="2" enabled="0" tolerance="0" id="water_tables20170921142016467" maxScale="0" minScale="0"/>
+      <layer-setting type="2" units="1" enabled="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" minScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -336,10 +337,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.39553763047966228</xmin>
-      <ymin>-33.91875794015667367</ymin>
-      <xmax>18.42054863549070021</xmax>
-      <ymax>-33.88880497692461091</ymax>
+      <xmin>18.40606100627099551</xmin>
+      <ymin>-33.90836307879926892</ymin>
+      <xmax>18.40755427348211271</xmax>
+      <ymax>-33.90684867733166641</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -360,176 +361,176 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" name="Marshals" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshal_positions" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup checked="Qt::Checked" name="Marshals" open="true">
+      <legendlayer checked="Qt::Checked" name="marshal_positions" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="extra_security" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="extra_security" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="marshals_by_position" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="marshals_by_position" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="complete_marshal_overview" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="complete_marshal_overview" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="marshal_overviews" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="marshal_overviews" showFeatureCount="0" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fencing" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+    <legendgroup checked="Qt::Checked" name="Fencing and Cones" open="true">
+      <legendlayer checked="Qt::Checked" name="fencing" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="cone_groups" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="cone_groups" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_groups" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="fence_groups" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="fence_and_cone_groups" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="fence_and_cone_groups" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Routes" checked="Qt::Checked">
-      <legendgroup open="true" name="Markers" checked="Qt::Checked">
-        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+    <legendgroup checked="Qt::Checked" name="Routes" open="true">
+      <legendgroup checked="Qt::Checked" name="Markers" open="true">
+        <legendlayer checked="Qt::Checked" name="route_markers" showFeatureCount="1" open="true" drawingOrder="-1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
           </filegroup>
         </legendlayer>
-        <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="route_markers" checked="Qt::Unchecked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
+        <legendlayer checked="Qt::Unchecked" name="route_markers" showFeatureCount="1" open="true" drawingOrder="-1">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="all_routes" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Checked" name="all_routes" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="timelapse" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
+    <legendlayer checked="Qt::Unchecked" name="timelapse" showFeatureCount="0" open="false" drawingOrder="-1">
+      <filegroup hidden="false" open="false">
         <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="water_tables" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
+      <legendlayer checked="Qt::Checked" name="water_tables" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="poi_labels" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
+      <legendlayer checked="Qt::Unchecked" name="poi_labels" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="directions_to_start" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="directions_to_start" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="mayor" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
+      <legendlayer checked="Qt::Unchecked" name="mayor" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="viplabels" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="viplabels" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="vipaccess" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="vipaccess" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="golfaccess" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="golfaccess" showFeatureCount="0" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access_roads" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="residents_access_roads" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="residents_access" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="residents_access" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="1" name="osm_roads" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
+    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
+      <legendlayer checked="Qt::Checked" name="osm_roads" showFeatureCount="1" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="osm_places" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Checked" name="osm_places" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="data-comments" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
+      <legendlayer checked="Qt::Unchecked" name="data-comments" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="start_finish_area" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Unchecked" name="start_finish_area" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="1" name="capetownelevation-1m" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
+      <legendlayer checked="Qt::Unchecked" name="capetownelevation-1m" showFeatureCount="1" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Map" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup checked="Qt::Checked" name="Map" open="true">
+      <legendlayer checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" open="false" drawingOrder="-1">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" showFeatureCount="0" name="Outlines" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer checked="Qt::Checked" name="Outlines" showFeatureCount="0" open="true" drawingOrder="-1">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="annotation">
+  <main-annotation-layer type="annotation" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="0" styleCategories="AllStyleCategories" minScale="0" autoRefreshEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -590,7 +591,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="100000" type="raster">
+    <maplayer type="raster" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="100000" styleCategories="AllStyleCategories" minScale="1e+08" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -656,7 +657,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -681,97 +682,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
+      <elevation enabled="0" zoffset="0" band="1" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -780,28 +781,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Value"/>
+          <Option 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>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling maxOversampling="2" enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer nodataColor="" opacity="0.5" blueBand="3" alphaBand="-1" redBand="1" greenBand="2" type="multibandcolor">
+        <rasterrenderer type="multibandcolor" redBand="1" alphaBand="-1" greenBand="2" opacity="0.5" nodataColor="" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -812,14 +813,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeStrength="100" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeRed="255" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" maxScale="0" type="raster">
+    <maplayer type="raster" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="" maxScale="0" styleCategories="AllStyleCategories" minScale="1e+08" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -885,7 +886,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -908,97 +909,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" enabled="0" zscale="1" symbology="Line">
+      <elevation enabled="0" zoffset="0" band="1" zscale="1" symbology="Line">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1007,28 +1008,28 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
-          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="identify/format" type="QString" value="Undefined"/>
+          <Option 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>
       <mapTip enabled="1"></mapTip>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option name="name" type="QString" value=""/>
+          <Option type="QString" name="name" value=""/>
           <Option name="properties"/>
-          <Option name="type" type="QString" value="collection"/>
+          <Option type="QString" name="type" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
+          <resampling maxOversampling="2" enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer nodataColor="" opacity="0.75" alphaBand="-1" band="1" type="singlebandcolordata">
+        <rasterrenderer type="singlebandcolordata" alphaBand="-1" band="1" opacity="0.75" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1039,14 +1040,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" gamma="1" brightness="0"/>
-        <huesaturation colorizeBlue="128" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeRed="255"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation grayscaleMode="0" colorizeStrength="100" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeRed="255" invertColors="0" colorizeBlue="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1112,7 +1113,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="EPSG:4326" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1126,8 +1127,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_km" expression="$length * 100" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_m" expression="$length * 100 * 1000" length="-1" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1140,264 +1141,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="RouteLen" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="RouteLen" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="Show by day" symbol="0" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule label="21KM" symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule label="10KM" symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule label="5KM" symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule label="Trail" symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day" symbol="0">
+            <rule description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" label="21KM" checkstate="0" symbol="1"/>
+            <rule description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" label="10KM" checkstate="0" symbol="2"/>
+            <rule description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; ILIKE '5KM%'" label="5KM" checkstate="0" symbol="3"/>
+            <rule description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" label="Trail" checkstate="0" symbol="4"/>
           </rule>
-          <rule label="Always show" symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule label="Always show by day" symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show" checkstate="0" symbol="5"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Always show by day" checkstate="0" symbol="6"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@0@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1405,308 +1406,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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; ILIKE '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="outlineStyle" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="true"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option name="type" type="int" value="3"/>
+                      <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{d9268524-45f1-4731-945d-c43780c8de62}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="1"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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="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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1714,308 +1715,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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.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="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@2@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2023,308 +2024,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@3@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@3@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="145,211,55,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2332,308 +2333,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,211,55,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="145,211,55,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="250"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@4@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="0,72,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@4@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@4@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,72,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2641,302 +2642,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,72,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option type="Map" name="outlineStyle">
+                      <Option type="bool" name="active" value="false"/>
+                      <Option type="QString" name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )"/>
+                      <Option type="int" name="type" value="3"/>
                     </Option>
                   </Option>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@2" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@4@2" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,72,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="FirstVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@4@3" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@4@3" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,72,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="fillColor" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="5" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="6" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="6" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.46"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -2948,334 +2949,334 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
+          <rule description="Active routes" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round($length / 1000, 0)" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round($length / 1000, 0)" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="164,113,88,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="1" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="km_marker()" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="1" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
+          <rule description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" active="0">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100, 4 )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100, 4 )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="164,113,88,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="50" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="km_marker()" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapAtNoCost" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="50" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="km_marker()" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapAtNoCost" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -3284,77 +3285,70 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" 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>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{99bd229d-7319-436f-b616-1be11812c381}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3362,16 +3356,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3382,8 +3376,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3392,8 +3386,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3402,8 +3396,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3412,8 +3406,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3422,8 +3416,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3446,8 +3440,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3456,8 +3450,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -3466,24 +3460,24 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="begin" name=""/>
+        <alias index="2" field="end" name=""/>
+        <alias index="3" field="Distance" name=""/>
+        <alias index="4" field="RouteLen" name=""/>
+        <alias index="5" field="Sort" name=""/>
+        <alias index="6" field="day" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="length_m" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -3498,28 +3492,28 @@
         <policy policy="Duplicate" field="length_m"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Sort" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="Name" exp=""/>
@@ -3534,25 +3528,25 @@
         <constraint desc="" field="length_m" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" expression="$length * 100" typeName="double precision" name="length_km" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="$length * 100 * 1000" typeName="double precision" name="length_m" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_km" expression="$length * 100" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="length_m" expression="$length * 100 * 1000" length="-1" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;">
         <columns>
-          <column width="121" name="Name" hidden="0" type="field"/>
-          <column width="141" name="begin" hidden="0" type="field"/>
-          <column width="31" name="end" hidden="0" type="field"/>
-          <column width="66" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="39" name="RouteLen" hidden="0" type="field"/>
-          <column width="250" name="Source" hidden="0" type="field"/>
-          <column width="175" name="length_m" hidden="0" type="field"/>
-          <column width="50" name="Sort" hidden="0" type="field"/>
-          <column width="31" name="day" hidden="0" type="field"/>
-          <column width="266" name="length_km" hidden="0" type="field"/>
+          <column type="field" width="121" name="Name" hidden="0"/>
+          <column type="field" width="141" name="begin" hidden="0"/>
+          <column type="field" width="31" name="end" hidden="0"/>
+          <column type="field" width="66" name="Distance" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="39" name="RouteLen" hidden="0"/>
+          <column type="field" width="250" name="Source" hidden="0"/>
+          <column type="field" width="175" name="length_m" hidden="0"/>
+          <column type="field" width="50" name="Sort" hidden="0"/>
+          <column type="field" width="31" name="day" hidden="0"/>
+          <column type="field" width="266" name="length_km" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3584,53 +3578,53 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </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="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <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"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3704,189 +3698,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{53b6bbaf-4722-434f-a142-936b95477967}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="183,72,75,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3897,15 +3891,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option 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>
@@ -3935,9 +3929,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="ID"/>
@@ -3945,14 +3939,14 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="elevation"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="ID" applyOnUpdate="0"/>
-        <default expression="" field="height" applyOnUpdate="0"/>
-        <default expression="" field="elevation" applyOnUpdate="0"/>
+        <default field="ID" applyOnUpdate="0" expression=""/>
+        <default field="height" applyOnUpdate="0" expression=""/>
+        <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="ID" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="height" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="elevation" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="ID" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="height" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="elevation" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="ID" exp=""/>
@@ -3961,9 +3955,9 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3986,7 +3980,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4062,173 +4056,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4239,15 +4233,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option 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 type="QString" value=""/>
         </activeChecks>
@@ -4286,10 +4280,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -4298,16 +4292,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="page" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -4317,9 +4311,9 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4342,18 +4336,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </wgs84extent>
       <id>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22</datasource>
@@ -4408,7 +4402,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4437,173 +4431,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="243,166,178,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="38,162,105,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="cross"/>
+                <Option 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="38,162,105,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="cross"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4614,68 +4608,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;name&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="int" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="int" 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 opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="1" width="15">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4683,22 +4677,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -4749,12 +4743,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
-        <alias name="" index="5" field="cone_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="fence_len" name=""/>
+        <alias index="5" field="cone_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -4765,20 +4759,20 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="cone_len"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="name" exp=""/>
@@ -4790,16 +4784,16 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="306" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="306" name="name" hidden="0"/>
+          <column type="field" width="-1" name="group" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4831,32 +4825,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4932,173 +4926,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="243,166,178,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="243,166,178,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="174,119,127,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="38,162,105,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="f_diagonal"/>
+                <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="38,162,105,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="f_diagonal"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5109,68 +5103,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;name&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="int" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option type="int" 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 opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="5" direction="0" backgroundAlpha="255" showAxis="1" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="0" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="5" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="1" width="15">
+          <fontProperties description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5178,22 +5172,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -5237,11 +5231,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="cone_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="cone_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -5251,18 +5245,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="cone_len"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="name" exp=""/>
@@ -5273,17 +5267,17 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="306" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" name="fence_len" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="306" name="name" hidden="0"/>
+          <column type="field" width="-1" name="group" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column type="field" width="-1" name="fence_len" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5315,32 +5309,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5406,7 +5400,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5431,189 +5425,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,85,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5624,151 +5618,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="Name" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="Name" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="LineGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="LineGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5776,16 +5770,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5808,20 +5802,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Name"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="Name"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -5829,13 +5823,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5867,12 +5861,12 @@ 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 name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -5880,7 +5874,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5946,7 +5940,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5971,319 +5965,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" symbol="0" filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule label="10KM" symbol="1" filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule label="5KM" symbol="2" filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" label="21KM" symbol="0"/>
+          <rule description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" label="10KM" symbol="1"/>
+          <rule description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" label="5KM" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="miter"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="area"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="210,32,39,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@0@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@0@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="210,32,39,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6291,147 +6285,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="210,32,39,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6439,100 +6433,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{43e5e783-9402-4471-b264-9b43c9035744}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6540,147 +6534,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="500"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@0@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@2@0@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.5"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6688,100 +6682,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="100"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="interval" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="69,100,25,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MapUnit"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@2@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@2@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="69,100,25,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6789,41 +6783,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MapUnit"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="69,100,25,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MapUnit"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6835,66 +6829,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6902,16 +6896,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6929,28 +6923,28 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="Distance"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -6958,13 +6952,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
+          <column type="field" width="-1" name="Distance" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6996,30 +6990,30 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -7027,7 +7021,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7101,187 +7095,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="0.796078" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.796078" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="227,0,185,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,0"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7292,268 +7286,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="1" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="8" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontSize="4" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="227,0,185,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="227,0,185,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="4" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="FontStyle" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="2" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -7562,200 +7556,200 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7763,16 +7757,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="10" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="10">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7783,8 +7777,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7793,8 +7787,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -7803,17 +7797,17 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -7821,14 +7815,14 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="type"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="position" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -7837,14 +7831,14 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="position" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7920,18 +7914,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="Polygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Polygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.90152236072362513</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.90152236072362513</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </wgs84extent>
       <id>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22</datasource>
@@ -7986,7 +7980,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8015,173 +8009,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,85,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,85,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8192,68 +8186,68 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;name&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8261,22 +8255,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -8320,11 +8314,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="day" name=""/>
+        <alias index="4" field="fence_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="name"/>
@@ -8334,18 +8328,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="fence_len"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="group" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="name" exp=""/>
@@ -8356,17 +8350,17 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="415" name="name" hidden="0" type="field"/>
-          <column width="-1" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="cone_len" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column type="field" width="415" name="name" hidden="0"/>
+          <column type="field" width="-1" name="group" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="cone_len" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="fence_len" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8398,46 +8392,46 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="cone_len"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="fence_len"/>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
-        <field editable="1" name="type"/>
+        <field name="cone_len" editable="1"/>
+        <field name="day" editable="1"/>
+        <field name="fence_len" editable="1"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
+        <field name="type" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
         <xmax>18.42224231378492405</xmax>
-        <ymax>-33.89967145949319871</ymax>
+        <ymax>-33.89948416367736428</ymax>
       </wgs84extent>
       <id>fencing_70522fe0_a771_4170_98b2_d5843f62a7ab</id>
       <datasource>./fencing.shp|layername=fencing</datasource>
@@ -8492,7 +8486,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="EPSG:4326" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="EPSG:4326" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8506,26 +8500,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyDrawingHints="1" simplifyLocal="1" minScale="1e+08" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" readOnly="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" version="3.8.3-Zanzibar" maxScale="0" simplifyAlgorithm="0" simplifyDrawingTol="1">
+          <qgis labelsEnabled="1" simplifyMaxScale="1" simplifyDrawingHints="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" version="3.8.3-Zanzibar" simplifyAlgorithm="0" readOnly="0" maxScale="0" styleCategories="AllStyleCategories" minScale="1e+08" simplifyLocal="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" type="RuleRenderer">
+            <renderer-v2 type="RuleRenderer" symbollevels="1" forceraster="0" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol alpha="1" clip_to_extent="1" name="0" force_rhr="0" type="line">
-                  <layer locked="0" pass="0" enabled="1" class="SimpleLine">
+                <symbol type="line" alpha="1" clip_to_extent="1" name="0" force_rhr="0">
+                  <layer pass="0" class="SimpleLine" enabled="1" locked="0">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -8544,9 +8538,9 @@ def my_form_open(dialog, layer, feature):
                     <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" value="collection" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8557,62 +8551,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontSize="11" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.8" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Regular" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="comment">
-                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                      <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.6" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeJoinStyle="128" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiX="1" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" fieldName="comment" isExpression="0" fontWeight="50" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="0.8" multilineHeight="1" fontStrikeout="0" fontCapitals="0" namedStyle="Regular" previewBkgrdColor="#ffffff" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                      <background shapeBlendMode="0" shapeOpacity="0.6" shapeSizeX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeBorderWidth="0.6" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeRotation="0" shapeSizeY="1" shapeRadiiY="1" shapeDraw="1"/>
+                      <shadow shadowOffsetUnit="MM" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="4" placementFlags="2" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="5" yOffset="0" rotationAngle="0" distUnits="MM"/>
-                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" displayAll="1" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                    <text-format autoWrapLength="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                    <placement fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" offsetUnits="MM" xOffset="0" distUnits="MM" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" quadOffset="4" centroidInside="0" preserveRotation="1" dist="5" priority="5" placement="4" placementFlags="2" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" yOffset="0"/>
+                    <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="1" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" displayAll="1" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
-                            <Option name="type" value="2" type="int"/>
+                        <Option 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 name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
-                            <Option name="type" value="2" 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 name="type" value="collection" 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)')">
                   <settings>
-                    <text-style fontSize="12" fontSizeUnit="Point" useSubstitutions="0" fontCapitals="0" fontItalic="0" isExpression="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" namedStyle="Semibold" fontStrikeout="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'">
-                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                      <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiX="0" shapeBorderWidthUnit="MM" shapeRotation="0" shapeRadiiUnit="MM"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowDraw="0" shadowUnder="0" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                    <text-style fontLetterSpacing="0" fieldName="round( $length, 1) || 'm'" isExpression="1" fontWeight="63" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" multilineHeight="1" fontStrikeout="0" fontCapitals="0" namedStyle="Semibold" previewBkgrdColor="#ffffff" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" useSubstitutions="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                      <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeBorderWidth="0" shapeSVGFile="" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeRotation="0" shapeSizeY="0" shapeRadiiY="0" shapeDraw="0"/>
+                      <shadow shadowOffsetUnit="MM" shadowRadius="1.5" shadowUnder="0" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" reverseDirectionSymbol="0" wrapChar="" addDirectionSymbol="0" plussign="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-                    <placement xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="2" placementFlags="15" centroidWhole="0" quadOffset="4" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" priority="5" geometryGeneratorEnabled="0" repeatDistance="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" centroidInside="0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" geometryGenerator="" dist="1" yOffset="0" rotationAngle="0" distUnits="MM"/>
-                    <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" displayAll="0" drawLabels="1" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                    <text-format autoWrapLength="0" plussign="0" wrapChar="" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                    <placement fitInPolygonOnly="0" geometryGeneratorType="PointGeometry" offsetUnits="MM" xOffset="0" distUnits="MM" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" quadOffset="4" centroidInside="0" preserveRotation="1" dist="1" priority="5" placement="2" placementFlags="15" maxCurvedCharAngleIn="25" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" repeatDistanceUnits="MM" centroidWhole="0" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" yOffset="0"/>
+                    <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" displayAll="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option name="name" value="" type="QString"/>
-                        <Option name="properties" type="Map">
-                          <Option name="PositionX" type="Map">
-                            <Option name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
-                            <Option name="type" value="2" type="int"/>
+                        <Option 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 name="active" value="true" type="bool"/>
-                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
-                            <Option name="type" value="2" 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 name="type" value="collection" type="QString"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -8620,8 +8614,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -8629,21 +8623,21 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory opacity="1" backgroundColor="#ffffff" scaleDependency="Area" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" penWidth="0" penAlpha="255" width="15" rotationOffset="270" minScaleDenominator="0" barWidth="5" backgroundAlpha="255" minimumSize="0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" color="#000000" field=""/>
+              <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" height="15" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" opacity="1" rotationOffset="270" penColor="#000000" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" sizeType="MM" diagramOrientation="Up" barWidth="5" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" minimumSize="0" minScaleDenominator="0" width="15">
+                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+            <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
               <properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" 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>
@@ -8727,45 +8721,45 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" index="0" field="id"/>
-              <alias name="" index="1" field="group"/>
-              <alias name="" index="2" field="comment"/>
-              <alias name="" index="3" field="moveable"/>
-              <alias name="" index="4" field="type"/>
-              <alias name="" index="5" field="name"/>
-              <alias name="" index="6" field="hidden"/>
-              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-              <alias name="" index="9" field="fence_len"/>
-              <alias name="" index="10" field="cone_len"/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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"/>
+              <default field="id" applyOnUpdate="0" expression=""/>
+              <default field="group" applyOnUpdate="0" expression=""/>
+              <default field="comment" applyOnUpdate="0" expression=""/>
+              <default field="moveable" applyOnUpdate="0" expression=""/>
+              <default field="type" applyOnUpdate="0" expression=""/>
+              <default field="name" applyOnUpdate="0" expression=""/>
+              <default field="hidden" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+              <default field="fence_len" applyOnUpdate="0" expression=""/>
+              <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="id"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="group"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="comment"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="moveable"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="type"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="name"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="hidden"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positiony"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="auxiliary_storage_labeling_positionx"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="fence_len"/>
-              <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="cone_len"/>
+              <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="comment" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="moveable" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="hidden" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
             </constraints>
             <constraintExpressions>
               <constraint desc="" field="id" exp=""/>
@@ -8781,27 +8775,27 @@ def my_form_open(dialog, layer, feature):
               <constraint desc="" field="cone_len" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-              <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
+              <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" precision="0"/>
+              <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0"/>
+              <field type="6" subType="0" typeName="double precision" comment="" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" precision="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+            <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;">
               <columns>
-                <column width="-1" name="id" hidden="0" type="field"/>
-                <column width="-1" name="group" hidden="0" type="field"/>
-                <column width="-1" hidden="1" type="actions"/>
-                <column width="223" name="comment" hidden="0" type="field"/>
-                <column width="-1" name="moveable" hidden="0" type="field"/>
-                <column width="-1" name="type" hidden="0" type="field"/>
-                <column width="414" name="name" hidden="0" type="field"/>
-                <column width="-1" name="hidden" hidden="0" type="field"/>
-                <column width="-1" name="fence_len" hidden="0" type="field"/>
-                <column width="-1" name="cone_len" hidden="0" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
-                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
+                <column type="field" width="-1" name="id" hidden="0"/>
+                <column type="field" width="-1" name="group" hidden="0"/>
+                <column type="actions" width="-1" hidden="1"/>
+                <column type="field" width="223" name="comment" hidden="0"/>
+                <column type="field" width="-1" name="moveable" hidden="0"/>
+                <column type="field" width="-1" name="type" hidden="0"/>
+                <column type="field" width="414" name="name" hidden="0"/>
+                <column type="field" width="-1" name="hidden" hidden="0"/>
+                <column type="field" width="-1" name="fence_len" hidden="0"/>
+                <column type="field" width="-1" name="cone_len" hidden="0"/>
+                <column type="field" width="-1" name="auxiliary_storage_labeling_positiony" hidden="1"/>
+                <column type="field" width="-1" name="auxiliary_storage_labeling_positionx" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8832,32 +8826,32 @@ 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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -8874,458 +8868,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="133,182,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="133,182,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="95,130,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="1" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule label="Cones" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule label="Moveable fences" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule label="Fixed fences" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule label="Construction" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Cones" symbol="0"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Moveable fences" symbol="1"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Fixed fences" symbol="2"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Construction" symbol="3"/>
           </rule>
-          <rule label="Is Visible" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-          <rule label="Always show" symbol="5" checkstate="0" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Is Visible" checkstate="0" symbol="4"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="1;4"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="Point"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dot"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="round"/>
-                <Option name="customdash" type="QString" value="4;3"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,0,255,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.8"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="5" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.5"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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.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="MM"/>
+                <Option type="QString" name="ring_filter" value="0"/>
+                <Option type="QString" name="trim_distance_end" value="0"/>
+                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                <Option type="QString" name="trim_distance_start" value="0"/>
+                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                <Option type="QString" name="use_custom_dash" value="0"/>
+                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9333,670 +9327,670 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{77c2da81-3827-4244-9739-7740942dd20c}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{63187879-e575-420a-b139-9295c560dc57}">
+        <rules key="{b08c8161-de6f-41d9-a933-40d5428d7db9}">
+          <rule key="{bc58db75-d3ce-4eaf-8459-5b648cb31e6d}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="comment" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="comment" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="0.80000000000000004" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeJoinStyle="128" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.59999999999999998" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="1" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.6"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                        <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="5" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8200000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="1" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1.8200000000000001" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                  <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{1125f4a3-b660-4c4e-bb30-9a3f89c0fc6e}">
+          <rule description="Fence lengths" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{8c77ba5e-b512-4ff7-b7ad-7fb26939c5cd}">
+          <rule description="Cones lengths" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{db4fb198-5646-4029-8e3c-b5f68e241df8}">
+          <rule key="{ed34792d-3215-42ff-8038-8130a45d3742}" active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="&quot;hidden&quot; IS NULL" description="Always show" key="{a7eac08d-b9bd-4780-93fa-cd225df55dde}">
+          <rule description="Always show" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}" active="0" filter="&quot;hidden&quot; IS NULL">
             <settings calloutType="simple">
-              <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="round( $length * 100 * 1000, 1) || 'm'" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="color" value="255,255,255,255"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                        <Option type="QString" name="outline_style" value="no"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="style" value="solid"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="6" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="14" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="6" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="14" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="1"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -10005,68 +9999,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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="&quot;id&quot;"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10074,16 +10068,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10162,16 +10156,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
-        <alias name="" index="7" field="day"/>
-        <alias name="" index="8" field="fence_len"/>
-        <alias name="" index="9" field="cone_len"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="day" name=""/>
+        <alias index="8" field="fence_len" name=""/>
+        <alias index="9" field="cone_len" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -10186,28 +10180,28 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="cone_len"/>
       </splitPolicies>
       <defaults>
-        <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="day" applyOnUpdate="0"/>
-        <default expression="" field="fence_len" applyOnUpdate="0"/>
-        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default field="moveable" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="hidden" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="group" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="comment" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="moveable" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="hidden" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fence_len" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="cone_len" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="group" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="comment" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="moveable" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="hidden" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="fence_len" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="cone_len" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -10222,26 +10216,26 @@ def my_form_open(dialog, layer, feature):
         <constraint desc="" field="cone_len" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" length="-1" type="6" subType="0"/>
-        <field comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" typeName="double precision" name="cone_len" length="-1" type="6" subType="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="fence_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0"/>
+        <field type="6" subType="0" typeName="double precision" comment="" name="cone_len" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="31" name="id" hidden="0" type="field"/>
-          <column width="52" name="group" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="143" name="comment" hidden="0" type="field"/>
-          <column width="-1" name="moveable" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="303" name="name" hidden="0" type="field"/>
-          <column width="54" name="hidden" hidden="0" type="field"/>
-          <column width="74" name="fence_len" hidden="0" type="field"/>
-          <column width="40" name="day" hidden="0" type="field"/>
-          <column width="65" name="cone_len" hidden="0" type="field"/>
+          <column type="field" width="31" name="id" hidden="0"/>
+          <column type="field" width="52" name="group" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="85" name="comment" hidden="0"/>
+          <column type="field" width="-1" name="moveable" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="340" name="name" hidden="0"/>
+          <column type="field" width="54" name="hidden" hidden="0"/>
+          <column type="field" width="74" name="fence_len" hidden="0"/>
+          <column type="field" width="40" name="day" hidden="0"/>
+          <column type="field" width="65" name="cone_len" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10273,53 +10267,53 @@ 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="1" name="day"/>
-        <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="day" editable="1"/>
+        <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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="comment" reuseLastValue="0"/>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="hidden" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="moveable" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="comment"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="hidden"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="moveable"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10393,189 +10387,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="164,113,88,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="164,113,88,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="117,81,63,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,178,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10586,66 +10580,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10653,16 +10647,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10678,28 +10672,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10731,10 +10725,10 @@ 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 name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -10742,7 +10736,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10816,173 +10810,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="213,180,60,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="213,180,60,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="152,129,43,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="26,0,201,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="dot"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="b_diagonal"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10993,10 +10987,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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>' )"/>
@@ -11008,62 +11002,62 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11071,22 +11065,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties" type="Map">
-              <Option name="show" type="Map">
-                <Option name="active" type="bool" value="true"/>
-                <Option name="field" type="QString" value="id"/>
-                <Option name="type" type="int" value="2"/>
+            <Option 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 name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11097,8 +11091,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11107,8 +11101,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11117,8 +11111,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -11132,10 +11126,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -11144,16 +11138,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="page" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="page" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="page" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -11163,15 +11157,15 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="page" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="page" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11203,14 +11197,14 @@ 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 name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11218,7 +11212,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11284,7 +11278,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11295,7 +11289,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join customPrefix="csv_" joinFieldName="position" memoryCache="0" editable="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" hasCustomPrefix="1" joinLayerId="marshals_by_position20161003112326575">
+        <join cascadedDelete="0" memoryCache="0" customPrefix="csv_" dynamicForm="0" upsertOnEdit="1" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" editable="1" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -11322,264 +11316,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="id" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="id" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="114,155,111,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="81,111,79,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show by day in marshal plan" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule label="Always show in marshal plan" symbol="1" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule label="Show in marshal maps" symbol="2" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show by day in marshal plan" symbol="0"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Always show in marshal plan" symbol="1"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.8" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
+            <layer pass="1" class="SimpleMarker" enabled="1" locked="0" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="Pixel"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="0.8" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.8" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
+            <layer pass="1" class="SimpleMarker" enabled="1" locked="0" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="Pixel"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="0.01" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="0.01" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
+            <layer pass="1" class="SimpleMarker" enabled="1" locked="0" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.1"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11588,824 +11582,824 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="231,113,72,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="2" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="231,113,72,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1" zIndex="2" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="2" scaleMin="1" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="FontStyle" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </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="{fd239986-b557-4314-b05a-d8c40105e0bc}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.5" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.5" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.5" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.5" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option name="type" type="int" value="3"/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="AlwaysShow" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option name="type" type="int" value="3"/>
+                    <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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="active" type="bool" value="true"/>
-                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option name="type" type="int" value="3"/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="8" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="5" scaleMin="1" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option name="type" type="int" value="3"/>
+                  <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="6" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.59999999999999998" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="6" fontWordSpacing="0" blendMode="0" textOpacity="0.59999999999999998" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="8" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="8" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="5" scaleMin="1" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings calloutType="simple">
-              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="position" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="position" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0.20000000000000001" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeJoinStyle="64" shapeSizeY="0.20000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.90000000000000002" shapeSizeX="0.20000000000000001" shapeType="3" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeRadiiY="0" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="133,182,111,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="133,182,111,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,0,255"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.4"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="false"/>
-                              <Option name="type" type="int" value="1"/>
-                              <Option name="val" type="QString" value=""/>
+                          <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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="0"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="10" scaleMin="1" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="AlwaysShow" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -12414,205 +12408,203 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option type="QString" 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>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/angleOffset" type="QString" value="0"/>
-          <Option name="labeling/blendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
-          <Option name="labeling/bufferColorA" type="QString" value="255"/>
-          <Option name="labeling/bufferColorB" type="QString" value="255"/>
-          <Option name="labeling/bufferColorG" type="QString" value="255"/>
-          <Option name="labeling/bufferColorR" type="QString" value="255"/>
-          <Option name="labeling/bufferDraw" type="QString" value="false"/>
-          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
-          <Option name="labeling/bufferSize" type="QString" value="1"/>
-          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/bufferTransp" type="QString" value="0"/>
-          <Option name="labeling/centroidInside" type="QString" value="false"/>
-          <Option name="labeling/centroidWhole" type="QString" value="false"/>
-          <Option name="labeling/decimals" type="QString" value="3"/>
-          <Option name="labeling/displayAll" type="QString" value="false"/>
-          <Option name="labeling/dist" type="QString" value="0"/>
-          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/drawLabels" type="QString" value="false"/>
-          <Option name="labeling/enabled" type="QString" value="false"/>
-          <Option name="labeling/fieldName" type="QString" value="position"/>
-          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
-          <Option name="labeling/fontCapitals" type="QString" value="0"/>
-          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
-          <Option name="labeling/fontItalic" type="QString" value="false"/>
-          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
-          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
-          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
-          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
-          <Option name="labeling/fontSize" type="QString" value="10"/>
-          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
-          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
-          <Option name="labeling/fontUnderline" type="QString" value="false"/>
-          <Option name="labeling/fontWeight" type="QString" value="63"/>
-          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
-          <Option name="labeling/formatNumbers" type="QString" value="false"/>
-          <Option name="labeling/isExpression" type="QString" value="false"/>
-          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
-          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/labelPerPart" type="QString" value="false"/>
-          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
-          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
-          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
-          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
-          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
-          <Option name="labeling/mergeLines" type="QString" value="false"/>
-          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
-          <Option name="labeling/multilineAlign" type="QString" value="0"/>
-          <Option name="labeling/multilineHeight" type="QString" value="1"/>
-          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
-          <Option name="labeling/obstacle" type="QString" value="true"/>
-          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
-          <Option name="labeling/obstacleType" type="QString" value="0"/>
-          <Option name="labeling/offsetType" type="QString" value="0"/>
-          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
-          <Option name="labeling/placement" type="QString" value="0"/>
-          <Option name="labeling/placementFlags" type="QString" value="10"/>
-          <Option name="labeling/plussign" type="QString" value="false"/>
-          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option name="labeling/preserveRotation" type="QString" value="true"/>
-          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
-          <Option name="labeling/priority" type="QString" value="5"/>
-          <Option name="labeling/quadOffset" type="QString" value="4"/>
-          <Option name="labeling/repeatDistance" type="QString" value="0"/>
-          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
-          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
-          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
-          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
-          <Option name="labeling/scaleMin" type="QString" value="1"/>
-          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
-          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
-          <Option name="labeling/shadowColorB" type="QString" value="0"/>
-          <Option name="labeling/shadowColorG" type="QString" value="0"/>
-          <Option name="labeling/shadowColorR" type="QString" value="0"/>
-          <Option name="labeling/shadowDraw" type="QString" value="false"/>
-          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
-          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
-          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
-          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
-          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
-          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
-          <Option name="labeling/shadowScale" type="QString" value="100"/>
-          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
-          <Option name="labeling/shadowUnder" type="QString" value="0"/>
-          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
-          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
-          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeDraw" type="QString" value="true"/>
-          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
-          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
-          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
-          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
-          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
-          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
-          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
-          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
-          <Option name="labeling/shapeRotation" type="QString" value="0"/>
-          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
-          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
-          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
-          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
-          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
-          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
-          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
-          <Option name="labeling/shapeType" type="QString" value="0"/>
-          <Option name="labeling/textColorA" type="QString" value="255"/>
-          <Option name="labeling/textColorB" type="QString" value="255"/>
-          <Option name="labeling/textColorG" type="QString" value="255"/>
-          <Option name="labeling/textColorR" type="QString" value="255"/>
-          <Option name="labeling/textTransp" type="QString" value="0"/>
-          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
-          <Option name="labeling/wrapChar" type="QString" value=""/>
-          <Option name="labeling/xOffset" type="QString" value="0"/>
-          <Option name="labeling/yOffset" type="QString" value="0"/>
-          <Option name="labeling/zIndex" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{444d8fb8-2321-4272-9699-88b713425993}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12620,16 +12612,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12640,8 +12632,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12650,8 +12642,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12660,8 +12652,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="bool" value="false"/>
-                <Option name="UseHtml" type="bool" value="false"/>
+                <Option type="bool" name="IsMultiline" value="false"/>
+                <Option type="bool" name="UseHtml" value="false"/>
               </Option>
             </config>
           </editWidget>
@@ -12670,8 +12662,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -12685,11 +12677,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -12699,18 +12691,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <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="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="notes" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="position" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="notes" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="position" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="notes" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -12721,16 +12713,16 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="notes" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="position" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="notes" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12762,132 +12754,132 @@ 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_day"/>
-        <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_race"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="0" name="marshals_by_position_captain"/>
-        <field editable="0" name="marshals_by_position_captain_phone"/>
-        <field editable="0" name="marshals_by_position_club"/>
-        <field editable="0" name="marshals_by_position_day"/>
-        <field editable="0" name="marshals_by_position_first_runner"/>
-        <field editable="0" name="marshals_by_position_instructions"/>
-        <field editable="0" name="marshals_by_position_last_runner"/>
-        <field editable="0" name="marshals_by_position_position"/>
-        <field editable="0" name="marshals_by_position_race"/>
-        <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_day" 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_race" 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="marshals_by_position_captain" editable="0"/>
+        <field name="marshals_by_position_captain_phone" editable="0"/>
+        <field name="marshals_by_position_club" editable="0"/>
+        <field name="marshals_by_position_day" editable="0"/>
+        <field name="marshals_by_position_first_runner" editable="0"/>
+        <field name="marshals_by_position_instructions" editable="0"/>
+        <field name="marshals_by_position_last_runner" editable="0"/>
+        <field name="marshals_by_position_position" editable="0"/>
+        <field name="marshals_by_position_race" editable="0"/>
+        <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 name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_email" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_day" labelOnTop="0"/>
-        <field name="csv_days" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_race" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="marshals_by_position_captain" labelOnTop="0"/>
-        <field name="marshals_by_position_captain_phone" labelOnTop="0"/>
-        <field name="marshals_by_position_club" labelOnTop="0"/>
-        <field name="marshals_by_position_day" labelOnTop="0"/>
-        <field name="marshals_by_position_first_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_instructions" labelOnTop="0"/>
-        <field name="marshals_by_position_last_runner" labelOnTop="0"/>
-        <field name="marshals_by_position_position" labelOnTop="0"/>
-        <field name="marshals_by_position_race" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_email"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_day"/>
+        <field labelOnTop="0" name="csv_days"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_race"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="marshals_by_position_captain"/>
+        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
+        <field labelOnTop="0" name="marshals_by_position_club"/>
+        <field labelOnTop="0" name="marshals_by_position_day"/>
+        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_instructions"/>
+        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_position"/>
+        <field labelOnTop="0" name="marshals_by_position_race"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="csv_captain" reuseLastValue="0"/>
-        <field name="csv_captain_email" reuseLastValue="0"/>
-        <field name="csv_captain_phone" reuseLastValue="0"/>
-        <field name="csv_club" reuseLastValue="0"/>
-        <field name="csv_day" reuseLastValue="0"/>
-        <field name="csv_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_race" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain" reuseLastValue="0"/>
-        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
-        <field name="marshals_by_position_club" reuseLastValue="0"/>
-        <field name="marshals_by_position_day" reuseLastValue="0"/>
-        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
-        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
-        <field name="marshals_by_position_position" reuseLastValue="0"/>
-        <field name="marshals_by_position_race" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_day"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_race"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
+        <field reuseLastValue="0" name="marshals_by_position_club"/>
+        <field reuseLastValue="0" name="marshals_by_position_day"/>
+        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
+        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_position"/>
+        <field reuseLastValue="0" name="marshals_by_position_race"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -12937,7 +12929,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" readOnly="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" maxScale="100000" type="vector" geometry="No geometry" wkbType="NoGeometry">
+    <maplayer type="vector" geometry="No geometry" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" refreshOnNotifyMessage="" maxScale="100000" wkbType="NoGeometry" styleCategories="AllStyleCategories" minScale="1e+08" autoRefreshEnabled="0">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -12991,7 +12983,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" maxy="0" minz="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start/>
@@ -13016,138 +13008,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" startField="" enabled="0" fixedDuration="0" limitMode="0" durationField="" durationUnit="min" startExpression="">
         <fixedRange>
           <start/>
           <end/>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" clamping="Terrain" zoffset="0" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" value="" type="QString"/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" value="collection" type="QString"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="line">
+          <symbol is_animated="0" type="line" alpha="1" frame_rate="10" clip_to_extent="1" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
               <Option type="Map">
-                <Option name="align_dash_pattern" value="0" type="QString"/>
-                <Option name="capstyle" value="square" type="QString"/>
-                <Option name="customdash" value="5;2" type="QString"/>
-                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="customdash_unit" value="MM" type="QString"/>
-                <Option name="dash_pattern_offset" value="0" type="QString"/>
-                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
-                <Option name="draw_inside_polygon" value="0" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="line_color" value="243,166,178,255" type="QString"/>
-                <Option name="line_style" value="solid" type="QString"/>
-                <Option name="line_width" value="0.6" type="QString"/>
-                <Option name="line_width_unit" value="MM" type="QString"/>
-                <Option name="offset" value="0" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MM" type="QString"/>
-                <Option name="ring_filter" value="0" type="QString"/>
-                <Option name="trim_distance_end" value="0" type="QString"/>
-                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
-                <Option name="trim_distance_start" value="0" type="QString"/>
-                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
-                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
-                <Option name="use_custom_dash" value="0" type="QString"/>
-                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="fill">
+          <symbol is_animated="0" type="fill" alpha="1" frame_rate="10" clip_to_extent="1" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="color" value="243,166,178,255" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="offset" value="0,0" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MM" type="QString"/>
-                <Option name="outline_color" value="174,119,127,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.2" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="style" value="solid" type="QString"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" is_animated="0" name="" force_rhr="0" type="marker">
+          <symbol is_animated="0" type="marker" alpha="1" frame_rate="10" clip_to_extent="1" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" value="" type="QString"/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" value="collection" type="QString"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
               <Option type="Map">
-                <Option name="angle" value="0" type="QString"/>
-                <Option name="cap_style" value="square" type="QString"/>
-                <Option name="color" value="243,166,178,255" type="QString"/>
-                <Option name="horizontal_anchor_point" value="1" type="QString"/>
-                <Option name="joinstyle" value="bevel" type="QString"/>
-                <Option name="name" value="diamond" type="QString"/>
-                <Option name="offset" value="0,0" type="QString"/>
-                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="offset_unit" value="MM" type="QString"/>
-                <Option name="outline_color" value="174,119,127,255" type="QString"/>
-                <Option name="outline_style" value="solid" type="QString"/>
-                <Option name="outline_width" value="0.2" type="QString"/>
-                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="outline_width_unit" value="MM" type="QString"/>
-                <Option name="scale_method" value="diameter" type="QString"/>
-                <Option name="size" value="3" type="QString"/>
-                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
-                <Option name="size_unit" value="MM" type="QString"/>
-                <Option name="vertical_anchor_point" value="1" type="QString"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" value="" type="QString"/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" value="collection" type="QString"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13156,18 +13148,18 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" value="copy" type="QString"/>
-          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
-          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option value="first_name" type="QString"/>
+          <Option 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="first_name"/>
           </Option>
-          <Option name="embeddedWidgets/count" value="0" 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>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13185,8 +13177,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13209,8 +13201,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13233,8 +13225,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" value="0" type="QString"/>
-                <Option name="UseHtml" value="0" type="QString"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -13276,19 +13268,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="day"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="first_name"/>
-        <alias name="" index="3" field="surname"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_phone"/>
-        <alias name="" index="9" field="race"/>
-        <alias name="" index="10" field="first_runner"/>
-        <alias name="" index="11" field="last_runner"/>
-        <alias name="" index="12" field="instructions"/>
+        <alias index="0" field="day" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="first_name" name=""/>
+        <alias index="3" field="surname" name=""/>
+        <alias index="4" field="club" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="race" name=""/>
+        <alias index="10" field="first_runner" name=""/>
+        <alias index="11" field="last_runner" name=""/>
+        <alias index="12" field="instructions" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="day"/>
@@ -13306,34 +13298,34 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="instructions"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="position" applyOnUpdate="0"/>
-        <default expression="" field="first_name" applyOnUpdate="0"/>
-        <default expression="" field="surname" applyOnUpdate="0"/>
-        <default expression="" field="club" 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="race" applyOnUpdate="0"/>
-        <default expression="" field="first_runner" applyOnUpdate="0"/>
-        <default expression="" field="last_runner" applyOnUpdate="0"/>
-        <default expression="" field="instructions" applyOnUpdate="0"/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="first_name" applyOnUpdate="0" expression=""/>
+        <default field="surname" applyOnUpdate="0" expression=""/>
+        <default field="club" applyOnUpdate="0" expression=""/>
+        <default field="phone" applyOnUpdate="0" expression=""/>
+        <default field="email" applyOnUpdate="0" expression=""/>
+        <default field="captain" applyOnUpdate="0" expression=""/>
+        <default field="captain_phone" applyOnUpdate="0" expression=""/>
+        <default field="race" applyOnUpdate="0" expression=""/>
+        <default field="first_runner" applyOnUpdate="0" expression=""/>
+        <default field="last_runner" applyOnUpdate="0" expression=""/>
+        <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="day"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="position"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_name"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="surname"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="club"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="phone"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="email"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="captain_phone"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="race"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="first_runner"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="last_runner"/>
-        <constraint notnull_strength="0" unique_strength="0" constraints="0" exp_strength="0" field="instructions"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="position" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="first_name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="surname" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="club" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="phone" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="email" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="captain" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="captain_phone" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="race" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="first_runner" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="last_runner" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="instructions" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="day" exp=""/>
@@ -13352,24 +13344,24 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="position" hidden="0" type="field"/>
-          <column width="-1" name="club" hidden="0" type="field"/>
-          <column width="-1" name="phone" hidden="0" type="field"/>
-          <column width="-1" name="email" hidden="0" type="field"/>
-          <column width="-1" name="captain" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="first_runner" hidden="0" type="field"/>
-          <column width="-1" name="last_runner" hidden="0" type="field"/>
-          <column width="-1" name="instructions" hidden="0" type="field"/>
-          <column width="-1" name="surname" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="first_name" hidden="0" type="field"/>
-          <column width="-1" name="race" hidden="0" type="field"/>
-          <column width="-1" name="captain_phone" hidden="0" type="field"/>
+          <column type="field" width="-1" name="position" hidden="0"/>
+          <column type="field" width="-1" name="club" hidden="0"/>
+          <column type="field" width="-1" name="phone" hidden="0"/>
+          <column type="field" width="-1" name="email" hidden="0"/>
+          <column type="field" width="-1" name="captain" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="first_runner" hidden="0"/>
+          <column type="field" width="-1" name="last_runner" hidden="0"/>
+          <column type="field" width="-1" name="instructions" hidden="0"/>
+          <column type="field" width="-1" name="surname" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="first_name" hidden="0"/>
+          <column type="field" width="-1" name="race" hidden="0"/>
+          <column type="field" width="-1" name="captain_phone" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13401,76 +13393,76 @@ 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_email"/>
-        <field editable="1" name="captain_number"/>
-        <field editable="1" name="captain_phone"/>
-        <field editable="1" name="club"/>
-        <field editable="1" name="days"/>
-        <field editable="1" name="email"/>
-        <field editable="1" name="first_name"/>
-        <field editable="1" name="first_runner"/>
-        <field editable="1" name="firstname"/>
-        <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="surname"/>
-        <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_email" editable="1"/>
+        <field name="captain_number" editable="1"/>
+        <field name="captain_phone" editable="1"/>
+        <field name="club" editable="1"/>
+        <field name="days" editable="1"/>
+        <field name="email" editable="1"/>
+        <field name="first_name" editable="1"/>
+        <field name="first_runner" editable="1"/>
+        <field name="firstname" 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="surname" editable="1"/>
+        <field name="tshirt" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_email" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="captain_phone" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="days" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="firstname" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="surname" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_email"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="captain_phone"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="days"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="firstname"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="surname"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="captain" reuseLastValue="0"/>
-        <field name="captain_email" reuseLastValue="0"/>
-        <field name="captain_phone" reuseLastValue="0"/>
-        <field name="club" reuseLastValue="0"/>
-        <field name="days" reuseLastValue="0"/>
-        <field name="email" reuseLastValue="0"/>
-        <field name="first_runner" reuseLastValue="0"/>
-        <field name="firstname" reuseLastValue="0"/>
-        <field name="instructions" reuseLastValue="0"/>
-        <field name="last_runner" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="phone" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="surname" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="captain"/>
+        <field reuseLastValue="0" name="captain_email"/>
+        <field reuseLastValue="0" name="captain_phone"/>
+        <field reuseLastValue="0" name="club"/>
+        <field reuseLastValue="0" name="days"/>
+        <field reuseLastValue="0" name="email"/>
+        <field reuseLastValue="0" name="first_runner"/>
+        <field reuseLastValue="0" name="firstname"/>
+        <field reuseLastValue="0" name="instructions"/>
+        <field reuseLastValue="0" name="last_runner"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="phone"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="surname"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"/>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13536,7 +13528,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13561,326 +13553,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="141,90,153,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="141,90,153,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="101,64,109,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{743d2826-031c-45d5-809e-09f032abdd16}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13893,66 +13885,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13960,16 +13952,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13992,20 +13984,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="type"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -14013,13 +14005,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14051,12 +14043,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14064,7 +14056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14130,7 +14122,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14155,334 +14147,334 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="232,113,141,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="232,113,141,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="166,81,101,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="8.5" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.75" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="name" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8.5" fontWordSpacing="0" blendMode="0" textOpacity="0.75" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1.5" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1.5" bufferBlendMode="0" bufferDraw="1" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelRotation" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_x"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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 name="active" type="bool" value="true"/>
-                    <Option name="field" type="QString" value="label_y"/>
-                    <Option name="type" type="int" value="2"/>
+                  <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 name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="2" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.20000000000000001" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="1" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="2" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="0.20000000000000001" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14490,16 +14482,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14510,8 +14502,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14520,8 +14512,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14530,8 +14522,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14540,8 +14532,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14550,8 +14542,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14560,8 +14552,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14570,8 +14562,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14580,8 +14572,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -14590,23 +14582,23 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -14620,26 +14612,26 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="label_rota"/>
       </splitPolicies>
       <defaults>
-        <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"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="population" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="population" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="osm_id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="z_order" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="population" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_x" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_y" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_rota" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -14654,20 +14646,20 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" name="population" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="osm_id" hidden="0"/>
+          <column type="field" width="-1" name="name" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="field" width="-1" name="z_order" hidden="0"/>
+          <column type="field" width="-1" name="population" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="label_x" hidden="0"/>
+          <column type="field" width="-1" name="label_y" hidden="0"/>
+          <column type="field" width="-1" name="label_rota" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14699,26 +14691,26 @@ 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 name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -14726,7 +14718,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14792,7 +14784,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14817,374 +14809,374 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,158,23,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="255,158,23,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="182,113,16,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="7" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="0.80000000000000004" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="7" fontWordSpacing="0" blendMode="0" textOpacity="0.80000000000000004" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="196,60,57,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="2"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="LineGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" priority="3" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="3" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="4" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="5" mergeLines="1" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.29999999999999999" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="0" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="LineGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="3" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="4" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MapUnit" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="5" mergeLines="1" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="0.29999999999999999" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="AlwaysShow" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="always_sho"/>
-                  <Option name="type" type="int" value="2"/>
+              <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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="&quot;&quot;"/>
-                  <Option name="type" type="int" value="3"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_x"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="label_y"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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 name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15192,16 +15184,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15212,8 +15204,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15222,8 +15214,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15267,8 +15259,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -15331,22 +15323,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
-        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="osm_id"/>
@@ -15367,40 +15359,40 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="auxiliary_storage_labeling_show"/>
       </splitPolicies>
       <defaults>
-        <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"/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="highway" applyOnUpdate="0" expression=""/>
+        <default field="waterway" applyOnUpdate="0" expression=""/>
+        <default field="aerialway" applyOnUpdate="0" expression=""/>
+        <default field="barrier" applyOnUpdate="0" expression=""/>
+        <default field="man_made" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="other_tags" applyOnUpdate="0" expression=""/>
+        <default field="never_show" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="always_sho" applyOnUpdate="0" expression=""/>
+        <default field="resident_a" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="highway" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="waterway" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="aerialway" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="barrier" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="man_made" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="z_order" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="other_tags" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="never_show" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_x" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_y" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label_rota" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="always_sho" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="resident_a" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="auxiliary_storage_labeling_show" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="osm_id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="highway" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="waterway" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="aerialway" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="barrier" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="man_made" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="z_order" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="other_tags" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="never_show" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_x" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_y" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label_rota" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="always_sho" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="resident_a" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="auxiliary_storage_labeling_show" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="osm_id" exp=""/>
@@ -15422,27 +15414,27 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column width="-1" name="osm_id" hidden="0" type="field"/>
-          <column width="160" name="name" hidden="0" type="field"/>
-          <column width="-1" name="z_order" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="highway" hidden="0" type="field"/>
-          <column width="-1" name="waterway" hidden="0" type="field"/>
-          <column width="-1" name="aerialway" hidden="0" type="field"/>
-          <column width="-1" name="barrier" hidden="0" type="field"/>
-          <column width="-1" name="man_made" hidden="0" type="field"/>
-          <column width="175" name="other_tags" hidden="0" type="field"/>
-          <column width="-1" name="never_show" hidden="0" type="field"/>
-          <column width="-1" name="label_x" hidden="0" type="field"/>
-          <column width="-1" name="label_y" hidden="0" type="field"/>
-          <column width="-1" name="label_rota" hidden="0" type="field"/>
-          <column width="-1" name="always_sho" hidden="0" type="field"/>
-          <column width="-1" name="resident_a" hidden="0" type="field"/>
-          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
+          <column type="field" width="-1" name="osm_id" hidden="0"/>
+          <column type="field" width="160" name="name" hidden="0"/>
+          <column type="field" width="-1" name="z_order" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="highway" hidden="0"/>
+          <column type="field" width="-1" name="waterway" hidden="0"/>
+          <column type="field" width="-1" name="aerialway" hidden="0"/>
+          <column type="field" width="-1" name="barrier" hidden="0"/>
+          <column type="field" width="-1" name="man_made" hidden="0"/>
+          <column type="field" width="175" name="other_tags" hidden="0"/>
+          <column type="field" width="-1" name="never_show" hidden="0"/>
+          <column type="field" width="-1" name="label_x" hidden="0"/>
+          <column type="field" width="-1" name="label_y" hidden="0"/>
+          <column type="field" width="-1" name="label_rota" hidden="0"/>
+          <column type="field" width="-1" name="always_sho" hidden="0"/>
+          <column type="field" width="-1" name="resident_a" hidden="0"/>
+          <column type="field" width="-1" name="auxiliary_storage_labeling_show" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15474,94 +15466,94 @@ 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 name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue>
-        <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"/>
+        <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"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15611,7 +15603,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15677,7 +15669,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15702,511 +15694,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="231,113,72,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="231,113,72,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="165,81,51,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <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}"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'" symbol="1"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'" symbol="2"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'" symbol="3"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'" symbol="4"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="name" type="QString" value="star"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.5"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,32,80,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="7"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="../images/road_closure.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="0,12,254,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="255,255,255,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
-              <effect enabled="0" type="effectStack">
+              <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option 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>
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="1"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option type="QString" name="blend_mode" value="0"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="1"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="13"/>
-                    <Option name="blur_level" type="QString" value="2.645"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="0,0,0,255"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="offset_angle" type="QString" value="135"/>
-                    <Option name="offset_distance" type="QString" value="2"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="opacity" type="QString" value="1"/>
+                    <Option type="QString" name="blend_mode" value="13"/>
+                    <Option type="QString" name="blur_level" value="2.645"/>
+                    <Option type="QString" name="blur_unit" value="MM"/>
+                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="0,0,0,255"/>
+                    <Option type="QString" name="draw_mode" value="2"/>
+                    <Option type="QString" name="enabled" value="0"/>
+                    <Option type="QString" name="offset_angle" value="135"/>
+                    <Option type="QString" name="offset_distance" value="2"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="opacity" value="1"/>
                   </Option>
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option name="blend_mode" type="QString" value="0"/>
-                    <Option name="blur_level" type="QString" value="0.7935"/>
-                    <Option name="blur_unit" type="QString" value="MM"/>
-                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color1" type="QString" value="0,0,255,255"/>
-                    <Option name="color2" type="QString" value="0,255,0,255"/>
-                    <Option name="color_type" type="QString" value="0"/>
-                    <Option name="direction" type="QString" value="ccw"/>
-                    <Option name="discrete" type="QString" value="0"/>
-                    <Option name="draw_mode" type="QString" value="2"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="opacity" type="QString" value="0.5"/>
-                    <Option name="rampType" type="QString" value="gradient"/>
-                    <Option name="single_color" type="QString" value="255,255,255,255"/>
-                    <Option name="spec" type="QString" value="rgb"/>
-                    <Option name="spread" type="QString" value="2"/>
-                    <Option name="spread_unit" type="QString" value="MM"/>
-                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option 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>
                 </effect>
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="5" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="5" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
+            <layer pass="0" class="SvgMarker" enabled="1" locked="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="color" type="QString" value="43,153,41,255"/>
-                <Option name="fixedAspectRatio" type="QString" value="0"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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 name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="6"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="size" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16215,183 +16207,183 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="name" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="name" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="2" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeRadiiY="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="2" bufferBlendMode="0" bufferDraw="1" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="0.69999999999999996" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="1" shapeRotation="0" shapeRadiiY="2" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="LabelDistance" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="2"/>
-                    <Option name="type" type="int" value="3"/>
+                  <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 name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option name="type" type="int" value="3"/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="2" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="3" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="3" xOffset="2" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1.8" zIndex="10" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" centroidWhole="0" polygonPlacementFlags="2" xOffset="2" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="3" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="10" scaleMin="0" labelPerPart="0" obstacleFactor="1.8" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="LabelDistance" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="2"/>
-                  <Option name="type" type="int" value="3"/>
+                <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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16399,16 +16391,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16445,10 +16437,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -16457,16 +16449,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="distance"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="name" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -16476,15 +16468,15 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="name" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="name" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16516,16 +16508,16 @@ 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 name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16533,7 +16525,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16607,246 +16599,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="152,125,183,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="152,125,183,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="109,89,131,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
+            <layer pass="0" class="LinePatternFill" enabled="1" locked="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="135"/>
-                <Option name="clip_mode" type="QString" value="during_render"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="coordinate_reference" type="QString" value="feature"/>
-                <Option name="distance" type="QString" value="2"/>
-                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="distance_unit" type="QString" value="MM"/>
-                <Option name="line_width" type="QString" value="0.26"/>
-                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@0@0" is_animated="0" force_rhr="0" type="line">
+              <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@0@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
+                <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
                   <Option type="Map">
-                    <Option name="align_dash_pattern" type="QString" value="0"/>
-                    <Option name="capstyle" type="QString" value="square"/>
-                    <Option name="customdash" type="QString" value="5;2"/>
-                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="customdash_unit" type="QString" value="MM"/>
-                    <Option name="dash_pattern_offset" type="QString" value="0"/>
-                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                    <Option name="draw_inside_polygon" type="QString" value="0"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="line_color" type="QString" value="211,134,33,255"/>
-                    <Option name="line_style" type="QString" value="solid"/>
-                    <Option name="line_width" type="QString" value="0.3"/>
-                    <Option name="line_width_unit" type="QString" value="MM"/>
-                    <Option name="offset" type="QString" value="0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="ring_filter" type="QString" value="0"/>
-                    <Option name="trim_distance_end" type="QString" value="0"/>
-                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                    <Option name="trim_distance_start" type="QString" value="0"/>
-                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                    <Option name="use_custom_dash" type="QString" value="0"/>
-                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="211,134,33,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.46"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="no"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16857,66 +16849,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16924,16 +16916,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="1" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16949,29 +16941,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="FID"/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="FID"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="FID" applyOnUpdate="0"/>
+        <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="FID" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="FID" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="FID" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="431" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="431" name="type" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17003,12 +16995,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17016,7 +17008,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17082,7 +17074,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17107,612 +17099,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,207,80,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,207,80,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,148,57,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule label="No Parking" symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule label="Lane Closed" symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule label="One-Way" symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule label="Road Closures" symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" label="Road Open" symbol="0"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" label="No Parking" symbol="1"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed" symbol="2"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" label="One-Way" symbol="3"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="2"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@0" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@0" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="circle"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0.5"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="1"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="2" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="2" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="2;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash dot dot"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@2@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@2@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="3" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="3" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{07696f80-e7db-403b-b380-82695a86ae34}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="3;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="0,255,0,255"/>
-                <Option name="line_style" type="QString" value="dash"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="250"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MapUnit"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="25"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="Interval"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="enabled" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@3@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@3@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}">
+                <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{e24fa060-35e4-4c51-b944-426558636610}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="cap_style" type="QString" value="square"/>
-                    <Option name="color" type="QString" value="0,255,0,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                    <Option name="outline_style" type="QString" value="solid"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="3.5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="outlineStyle" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="4" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="4" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="255,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.75"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="outlineColor" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17721,151 +17713,151 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Regular" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="times" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="times" forcedBold="0" capitalization="0" isExpression="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Regular" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="4294967295" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="2" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="4294967295" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{27379576-e711-4788-850d-75df56ba927b}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17873,16 +17865,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17919,10 +17911,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -17931,16 +17923,16 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="times"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
-        <default expression="" field="status" applyOnUpdate="0"/>
-        <default expression="" field="times" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="status" applyOnUpdate="0" expression=""/>
+        <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="status" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="times" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="status" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="times" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -17950,15 +17942,15 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="202" name="type" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="status" hidden="0" type="field"/>
-          <column width="-1" name="times" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="202" name="type" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="status" hidden="0"/>
+          <column type="field" width="-1" name="times" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17990,16 +17982,16 @@ 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 name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18007,7 +17999,1479 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
+      <extent>
+        <xmin>18.37579747691996346</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.89978161061302586</ymax>
+      </extent>
+      <wgs84extent>
+        <xmin>18.37579747691996346</xmin>
+        <ymin>-33.95582399193413892</ymin>
+        <xmax>18.42274888203563066</xmax>
+        <ymax>-33.89978161061302586</ymax>
+      </wgs84extent>
+      <id>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
+      <keywordList>
+        <value></value>
+      </keywordList>
+      <layername>route_markers</layername>
+      <srs>
+        <spatialrefsys nativeFormat="Wkt">
+          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
+          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
+          <srsid>3452</srsid>
+          <srid>4326</srid>
+          <authid>EPSG:4326</authid>
+          <description>WGS 84</description>
+          <projectionacronym>longlat</projectionacronym>
+          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
+          <geographicflag>true</geographicflag>
+        </spatialrefsys>
+      </srs>
+      <resourceMetadata>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
+        <links/>
+        <dates/>
+        <fees></fees>
+        <encoding></encoding>
+        <crs>
+          <spatialrefsys nativeFormat="Wkt">
+            <wkt></wkt>
+            <proj4></proj4>
+            <srsid>0</srsid>
+            <srid>0</srid>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
+            <geographicflag>false</geographicflag>
+          </spatialrefsys>
+        </crs>
+        <extent/>
+      </resourceMetadata>
+      <provider encoding="">memory</provider>
+      <vectorjoins/>
+      <layerDependencies/>
+      <dataDependencies/>
+      <expressionfields/>
+      <map-layer-style-manager current="default">
+        <map-layer-style name="default"/>
+      </map-layer-style-manager>
+      <auxiliaryLayer/>
+      <metadataUrls/>
+      <flags>
+        <Identifiable>1</Identifiable>
+        <Removable>1</Removable>
+        <Searchable>1</Searchable>
+        <Private>0</Private>
+      </flags>
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
+        <fixedRange>
+          <start></start>
+          <end></end>
+        </fixedRange>
+      </temporal>
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" 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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleLine" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
+              <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>
+              <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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+              <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>
+              <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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+              <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>
+              <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" forceraster="0" enableorderby="0"/>
+      <labeling type="rule-based">
+        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
+          <rule description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <settings calloutType="simple">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                <families/>
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                      <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>
+                      <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; ILIKE '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; ILIKE '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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+              <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <settings calloutType="simple">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                <families/>
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                      <Option type="Map">
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                      </Option>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" name="name" value=""/>
+                          <Option name="properties"/>
+                          <Option type="QString" name="type" value="collection"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                      <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>
+                      <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; ILIKE '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; ILIKE '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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <dd_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </dd_properties>
+                <substitutions/>
+              </text-style>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+              <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                </Option>
+              </callout>
+            </settings>
+          </rule>
+          <rule description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" filter="&quot;Source&quot; = '21KM'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="210,32,39,255" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,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>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" filter="&quot;Source&quot; = '10KM'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="103,34,144,255" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,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>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" filter="&quot;Source&quot; ILIKE '5KM%'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                        <Option type="Map">
+                          <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="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        </Option>
+                        <data_defined_properties>
+                          <Option type="Map">
+                            <Option type="QString" name="name" value=""/>
+                            <Option name="properties"/>
+                            <Option type="QString" name="type" value="collection"/>
+                          </Option>
+                        </data_defined_properties>
+                      </layer>
+                    </symbol>
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </rule>
+            <rule description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" filter="&quot;Source&quot; = 'Trail'">
+              <settings calloutType="simple">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
+                  <families/>
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="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 pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
+                        <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>
+                        <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" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="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 pass="0" class="SimpleFill" enabled="1" locked="0" id="">
+                        <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>
+                        <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 shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <dd_properties>
+                    <Option type="Map">
+                      <Option type="QString" name="name" value=""/>
+                      <Option name="properties"/>
+                      <Option type="QString" name="type" value="collection"/>
+                    </Option>
+                  </dd_properties>
+                  <substitutions/>
+                </text-style>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
+                <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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  </Option>
+                </callout>
+              </settings>
+            </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 backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
+          <axisSymbol>
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="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 pass="0" class="SimpleLine" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+                <Option type="Map">
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                </Option>
+                <data_defined_properties>
+                  <Option type="Map">
+                    <Option type="QString" name="name" value=""/>
+                    <Option name="properties"/>
+                    <Option type="QString" name="type" value="collection"/>
+                  </Option>
+                </data_defined_properties>
+              </layer>
+            </symbol>
+          </axisSymbol>
+        </DiagramCategory>
+      </SingleCategoryDiagramRenderer>
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
+        <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="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="Sort" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="Source" configurationFlags="None">
+          <editWidget type="TextEdit">
+            <config>
+              <Option type="Map">
+                <Option 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="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>
+      </fieldConfiguration>
+      <aliases>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="begin" name=""/>
+        <alias index="2" field="end" name=""/>
+        <alias index="3" field="Distance" name=""/>
+        <alias index="4" field="RouteLen" name=""/>
+        <alias index="5" field="Sort" name=""/>
+        <alias index="6" field="day" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="length_m" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
+      </aliases>
+      <splitPolicies>
+        <policy policy="Duplicate" field="Name"/>
+        <policy policy="Duplicate" field="begin"/>
+        <policy policy="Duplicate" field="end"/>
+        <policy policy="Duplicate" field="Distance"/>
+        <policy policy="Duplicate" field="RouteLen"/>
+        <policy policy="Duplicate" field="Sort"/>
+        <policy policy="Duplicate" field="day"/>
+        <policy policy="Duplicate" field="Source"/>
+        <policy policy="Duplicate" field="length_km"/>
+        <policy policy="Duplicate" field="length_m"/>
+        <policy policy="Duplicate" field="org_fid"/>
+        <policy policy="Duplicate" field="distance"/>
+      </splitPolicies>
+      <defaults>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+      </defaults>
+      <constraints>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Sort" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="org_fid" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
+      </constraints>
+      <constraintExpressions>
+        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" field="begin" exp=""/>
+        <constraint desc="" field="end" exp=""/>
+        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" field="RouteLen" exp=""/>
+        <constraint desc="" field="Sort" exp=""/>
+        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" field="Source" exp=""/>
+        <constraint desc="" field="length_km" exp=""/>
+        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" field="org_fid" exp=""/>
+        <constraint desc="" field="distance" exp=""/>
+      </constraintExpressions>
+      <expressionfields/>
+      <attributeactions>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+      </attributeactions>
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;">
+        <columns>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="org_fid" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="field" width="-1" name="Source" hidden="0"/>
+          <column type="field" width="-1" name="RouteLen" hidden="0"/>
+          <column type="field" width="-1" name="begin" hidden="0"/>
+          <column type="field" width="-1" name="end" hidden="0"/>
+          <column type="field" width="-1" name="Distance" hidden="0"/>
+          <column type="field" width="-1" name="length_km" hidden="0"/>
+          <column type="field" width="-1" name="Sort" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="length_m" 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 reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
+      </reuseLastValue>
+      <dataDefinedFieldProperties/>
+      <widgets/>
+      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
+      <mapTip enabled="1">Text</mapTip>
+    </maplayer>
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="100000" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.37568387427754857</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -18081,1020 +19545,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
+          <rule description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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; ILIKE '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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
+          <rule description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="0,0,0,255" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option type="QString" name="angle" value="0"/>
+                        <Option type="QString" name="cap_style" value="square"/>
+                        <Option type="QString" name="color" value="213,180,60,255"/>
+                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                        <Option type="QString" name="joinstyle" value="bevel"/>
+                        <Option type="QString" name="name" value="circle"/>
+                        <Option type="QString" name="offset" value="0,0"/>
+                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="offset_unit" value="MM"/>
+                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                        <Option type="QString" name="outline_style" value="solid"/>
+                        <Option type="QString" name="outline_width" value="0"/>
+                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="outline_width_unit" value="MM"/>
+                        <Option type="QString" name="scale_method" value="diameter"/>
+                        <Option type="QString" name="size" value="2"/>
+                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                        <Option type="QString" name="size_unit" value="MM"/>
+                        <Option type="QString" name="vertical_anchor_point" value="1"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                          <Option 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; ILIKE '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 name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
+                            <Option 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; ILIKE '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 name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                  <Option 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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
+                    <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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
+          <rule description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" filter="&quot;Source&quot; = '21KM'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="210,32,39,255" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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 name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
+            <rule description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" filter="&quot;Source&quot; = '10KM'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="128" shapeFillColor="103,34,144,255" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                      <Option 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 name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
+                        <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 name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
+                        <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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
+            <rule description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" filter="&quot;Source&quot; ILIKE '5KM%'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="190,178,151,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                          <Option 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="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
+            <rule description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" filter="&quot;Source&quot; = 'Trail'">
               <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
+                <text-style fontLetterSpacing="0" allowHtml="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" forcedBold="0" capitalization="0" isExpression="1" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="255,255,255,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                   <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="64" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="1"/>
+                  <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="1" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="1" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="145,211,55,255" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="1" shapeDraw="1">
+                    <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="133,182,111,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
+                          <Option type="QString" name="angle" value="0"/>
+                          <Option type="QString" name="cap_style" value="square"/>
+                          <Option type="QString" name="color" value="133,182,111,255"/>
+                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
+                          <Option type="QString" name="joinstyle" value="bevel"/>
+                          <Option type="QString" name="name" value="circle"/>
+                          <Option type="QString" name="offset" value="0,0"/>
+                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="offset_unit" value="MM"/>
+                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
+                          <Option type="QString" name="outline_style" value="solid"/>
+                          <Option type="QString" name="outline_width" value="0"/>
+                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="outline_width_unit" value="MM"/>
+                          <Option type="QString" name="scale_method" value="diameter"/>
+                          <Option type="QString" name="size" value="2"/>
+                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                          <Option type="QString" name="size_unit" value="MM"/>
+                          <Option type="QString" name="vertical_anchor_point" value="1"/>
                         </Option>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                    <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                         <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="0,72,255,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
+                          <Option 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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
+                            <Option type="QString" name="name" value=""/>
                             <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
+                            <Option type="QString" name="type" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                  <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+                <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="0" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+                <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="1" overrunDistance="0" repeatDistance="0" layerType="PointGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="10" offsetType="0" maxCurvedCharAngleIn="20" overlapHandling="AllowOverlapIfRequired" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20"/>
+                <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="1" labelPerPart="0" obstacleFactor="2" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                    <Option 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 name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
+                      <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 name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
+                      <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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
+                    <Option 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 name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                    <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option type="double" name="minLength" value="0"/>
+                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="minLengthUnit" value="MM"/>
+                    <Option type="double" name="offsetFromAnchor" value="0"/>
+                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                    <Option type="double" name="offsetFromLabel" value="0"/>
+                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -19104,68 +20568,68 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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 name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="100000" showAxis="0" width="15">
+          <fontProperties description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19173,16 +20637,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19193,8 +20657,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19203,8 +20667,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19213,8 +20677,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19223,8 +20687,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19233,8 +20697,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19257,8 +20721,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19267,8 +20731,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19277,8 +20741,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19287,8 +20751,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19297,8 +20761,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -19312,19 +20776,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
-        <alias name="" index="12" field="quadrant"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="begin" name=""/>
+        <alias index="2" field="end" name=""/>
+        <alias index="3" field="Distance" name=""/>
+        <alias index="4" field="RouteLen" name=""/>
+        <alias index="5" field="Sort" name=""/>
+        <alias index="6" field="day" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="length_m" name=""/>
+        <alias index="10" field="org_fid" name=""/>
+        <alias index="11" field="distance" name=""/>
+        <alias index="12" field="quadrant" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -19342,34 +20806,34 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="quadrant"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-        <default expression="" field="quadrant" applyOnUpdate="0"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="quadrant" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="quadrant" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Sort" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="org_fid" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="quadrant" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="Name" exp=""/>
@@ -19388,26 +20852,26 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;">
         <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
-          <column width="-1" name="Sort" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="quadrant" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="org_fid" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="field" width="-1" name="Source" hidden="0"/>
+          <column type="field" width="-1" name="RouteLen" hidden="0"/>
+          <column type="field" width="-1" name="descriptio" hidden="0"/>
+          <column type="field" width="-1" name="timestamp" hidden="0"/>
+          <column type="field" width="-1" name="begin" hidden="0"/>
+          <column type="field" width="-1" name="end" hidden="0"/>
+          <column type="field" width="-1" name="Distance" hidden="0"/>
+          <column type="field" width="-1" name="length_km" hidden="0"/>
+          <column type="field" width="-1" name="Sort" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="-1" name="quadrant" hidden="0"/>
+          <column type="field" width="-1" name="length_m" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19439,1537 +20903,62 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <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"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="100000" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
-      <extent>
-        <xmin>18.37569549706161354</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37569549706161354</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.90032059191150893</ymax>
-      </wgs84extent>
-      <id>route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <dates/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
-              <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="225,89,137,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
-              <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
-              <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="225,89,137,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="161,64,98,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
-              </Option>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
-      <labeling type="rule-based">
-        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
-            <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
-            <settings calloutType="simple">
-              <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="0,0,0,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="213,180,60,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
-                        <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="0,0,0,255"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="1"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
-                      </Option>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties" type="Map">
-                            <Option name="fillColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                            <Option name="outlineColor" type="Map">
-                              <Option name="active" type="bool" value="true"/>
-                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option name="type" type="int" value="3"/>
-                            </Option>
-                          </Option>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="PositionX" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PositionY" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
-                    </Option>
-                    <Option name="PredefinedPositionOrder" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="field" type="QString" value="quadrant"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="Rotation" type="Map">
-                      <Option name="active" type="bool" value="false"/>
-                      <Option name="field" type="QString" value="rotation"/>
-                      <Option name="type" type="int" value="2"/>
-                    </Option>
-                    <Option name="ShapeBorderColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                    <Option name="ShapeFillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
-                    </Option>
-                  </Option>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </dd_properties>
-              <callout type="simple">
-                <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                </Option>
-              </callout>
-            </settings>
-          </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="210,32,39,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="210,32,39,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="3" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="103,34,144,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="128" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="103,34,144,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties" type="Map">
-                        <Option name="PositionX" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PositionY" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="type" type="int" value="1"/>
-                          <Option name="val" type="QString" value=""/>
-                        </Option>
-                        <Option name="PredefinedPositionOrder" type="Map">
-                          <Option name="active" type="bool" value="true"/>
-                          <Option name="field" type="QString" value="quadrant"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                        <Option name="Rotation" type="Map">
-                          <Option name="active" type="bool" value="false"/>
-                          <Option name="field" type="QString" value="rotation"/>
-                          <Option name="type" type="int" value="2"/>
-                        </Option>
-                      </Option>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; ILIKE '5KM%'" description="5KM" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="190,178,151,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="145,211,55,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
-              <settings calloutType="simple">
-                <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="1" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="255,255,255,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" textOrientation="horizontal" multilineHeightUnit="Percentage">
-                  <families/>
-                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="1"/>
-                  <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                  <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="145,211,55,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="1" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <Option type="Map">
-                          <Option name="angle" type="QString" value="0"/>
-                          <Option name="cap_style" type="QString" value="square"/>
-                          <Option name="color" type="QString" value="133,182,111,255"/>
-                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                          <Option name="joinstyle" type="QString" value="bevel"/>
-                          <Option name="name" type="QString" value="circle"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="0"/>
-                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="scale_method" type="QString" value="diameter"/>
-                          <Option name="size" type="QString" value="2"/>
-                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="size_unit" type="QString" value="MM"/>
-                          <Option name="vertical_anchor_point" type="QString" value="1"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
-                          <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <Option type="Map">
-                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="color" type="QString" value="0,72,255,255"/>
-                          <Option name="joinstyle" type="QString" value="round"/>
-                          <Option name="offset" type="QString" value="0,0"/>
-                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                          <Option name="offset_unit" type="QString" value="MM"/>
-                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
-                          <Option name="outline_style" type="QString" value="solid"/>
-                          <Option name="outline_width" type="QString" value="1"/>
-                          <Option name="outline_width_unit" type="QString" value="MM"/>
-                          <Option name="style" type="QString" value="solid"/>
-                        </Option>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option name="name" type="QString" value=""/>
-                            <Option name="properties"/>
-                            <Option name="type" type="QString" value="collection"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="0" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-                <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="20" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="1" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-20" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="PointGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="6" polygonPlacementFlags="2" centroidInside="0" overlapHandling="AllowOverlapIfRequired" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="2" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties" type="Map">
-                      <Option name="PositionX" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PositionY" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="type" type="int" value="1"/>
-                        <Option name="val" type="QString" value=""/>
-                      </Option>
-                      <Option name="PredefinedPositionOrder" type="Map">
-                        <Option name="active" type="bool" value="true"/>
-                        <Option name="field" type="QString" value="quadrant"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                      <Option name="Rotation" type="Map">
-                        <Option name="active" type="bool" value="false"/>
-                        <Option name="field" type="QString" value="rotation"/>
-                        <Option name="type" type="int" value="2"/>
-                      </Option>
-                    </Option>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </dd_properties>
-                <callout type="simple">
-                  <Option type="Map">
-                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                    <Option name="blendMode" type="int" value="0"/>
-                    <Option name="ddProperties" type="Map">
-                      <Option name="name" type="QString" value=""/>
-                      <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
-                    </Option>
-                    <Option name="drawToAllParts" type="bool" value="false"/>
-                    <Option name="enabled" type="QString" value="0"/>
-                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                    <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option name="minLength" type="double" value="0"/>
-                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="minLengthUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromAnchor" type="double" value="0"/>
-                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                    <Option name="offsetFromLabel" type="double" value="0"/>
-                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
-                  </Option>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </labeling>
-      <customproperties>
-        <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="no_action"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
-            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
-          </Option>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="100000" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
-          <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
-                </Option>
-              </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
-                <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                </Option>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
-                    <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
-        <properties>
-          <Option type="Map">
-            <Option name="name" type="QString" value=""/>
-            <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field name="Name" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="begin" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="end" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="RouteLen" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Sort" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="day" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="Source" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_km" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="length_m" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="org_fid" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="distance" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
-      </aliases>
-      <splitPolicies>
-        <policy policy="Duplicate" field="Name"/>
-        <policy policy="Duplicate" field="begin"/>
-        <policy policy="Duplicate" field="end"/>
-        <policy policy="Duplicate" field="Distance"/>
-        <policy policy="Duplicate" field="RouteLen"/>
-        <policy policy="Duplicate" field="Sort"/>
-        <policy policy="Duplicate" field="day"/>
-        <policy policy="Duplicate" field="Source"/>
-        <policy policy="Duplicate" field="length_km"/>
-        <policy policy="Duplicate" field="length_m"/>
-        <policy policy="Duplicate" field="org_fid"/>
-        <policy policy="Duplicate" field="distance"/>
-      </splitPolicies>
-      <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="Distance" applyOnUpdate="0"/>
-        <default expression="" field="RouteLen" applyOnUpdate="0"/>
-        <default expression="" field="Sort" applyOnUpdate="0"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
-        <default expression="" field="Source" applyOnUpdate="0"/>
-        <default expression="" field="length_km" applyOnUpdate="0"/>
-        <default expression="" field="length_m" applyOnUpdate="0"/>
-        <default expression="" field="org_fid" applyOnUpdate="0"/>
-        <default expression="" field="distance" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Sort" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortExpression="&quot;Source&quot;" sortOrder="0" actionWidgetStyle="dropDown">
-        <columns>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="Distance" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
-          <column width="-1" name="Sort" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="-1" name="quadrant" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field editable="1" name="Distance"/>
-        <field editable="1" name="Name"/>
-        <field editable="1" name="RouteLen"/>
-        <field editable="1" name="Sort"/>
-        <field editable="1" name="Source"/>
-        <field editable="1" name="begin"/>
-        <field editable="1" name="day"/>
-        <field editable="1" name="descriptio"/>
-        <field editable="1" name="distance"/>
-        <field editable="1" name="end"/>
-        <field editable="1" name="length_km"/>
-        <field editable="1" name="length_m"/>
-        <field editable="1" name="org_fid"/>
-        <field editable="1" name="quadrant"/>
-        <field editable="1" name="timestamp"/>
-      </editable>
-      <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
-      </labelOnTop>
-      <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip enabled="1">Text</mapTip>
-    </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21043,173 +21032,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="229,182,54,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="229,182,54,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="164,130,39,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="114,155,111,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21220,16 +21209,16 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option 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 type="QString" value=""/>
         </activeChecks>
@@ -21261,9 +21250,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="area"/>
-        <alias name="" index="2" field="rotation"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -21271,14 +21260,14 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="rotation"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="area" applyOnUpdate="0"/>
-        <default expression="" field="rotation" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="area" applyOnUpdate="0" expression=""/>
+        <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="area" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="rotation" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="area" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="rotation" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -21287,14 +21276,14 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="area" hidden="0" type="field"/>
-          <column width="-1" name="rotation" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="area" hidden="0"/>
+          <column type="field" width="-1" name="rotation" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21317,21 +21306,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Point" simplifyMaxScale="1">
       <extent>
-        <xmin>18.38475260238231712</xmin>
-        <ymin>-33.92228210414224776</ymin>
+        <xmin>18.37527697005977245</xmin>
+        <ymin>-33.94584879231483399</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.9031231546964662</ymax>
+        <ymax>-33.89948351196304799</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.38475260238231712</xmin>
-        <ymin>-33.92228210414224776</ymin>
+        <xmin>18.37527697005977245</xmin>
+        <ymin>-33.94584879231483399</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.9031231546964662</ymax>
+        <ymax>-33.89948351196304799</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000'</datasource>
+      <datasource>./timelapse.shp|layername=timelapse</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21383,7 +21372,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21408,195 +21397,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="196,60,57,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="196,60,57,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="140,43,41,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule label="All distances" symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances" checkstate="0" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" enabled="1" class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="circle"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,0"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="0.5"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
-                  <Option name="properties" type="Map">
-                    <Option name="fillColor" type="Map">
-                      <Option name="active" type="bool" value="true"/>
-                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option name="type" type="int" value="3"/>
+                  <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 name="active" type="bool" value="false"/>
-                      <Option name="type" type="int" value="1"/>
-                      <Option name="val" type="QString" value=""/>
+                    <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 name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21608,70 +21597,70 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="StringList">
+          <Option type="QString" 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 name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21679,16 +21668,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21720,8 +21709,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21737,8 +21726,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21747,8 +21736,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -21797,19 +21786,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="RouteLen"/>
-        <alias name="" index="6" field="Source"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="org_fid"/>
-        <alias name="" index="10" field="distance"/>
-        <alias name="" index="11" field="first_runn"/>
-        <alias name="" index="12" field="last_runne"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="Name"/>
@@ -21827,34 +21816,34 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="last_runne"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="Name" applyOnUpdate="0"/>
-        <default expression="" field="descriptio" applyOnUpdate="0"/>
-        <default expression="" field="timestamp" applyOnUpdate="0"/>
-        <default expression="" field="begin" applyOnUpdate="0"/>
-        <default expression="" field="end" applyOnUpdate="0"/>
-        <default expression="" field="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"/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="first_runn" applyOnUpdate="0" expression=""/>
+        <default field="last_runne" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Name" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="descriptio" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="timestamp" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="begin" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="end" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="RouteLen" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="Source" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_m" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="length_km" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="org_fid" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="distance" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="first_runn" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="last_runne" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Name" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="descriptio" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="timestamp" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="begin" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="end" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="RouteLen" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="Source" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_m" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="length_km" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="org_fid" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="distance" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="first_runn" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="last_runne" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="Name" exp=""/>
@@ -21873,24 +21862,24 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column width="179" name="begin" hidden="0" type="field"/>
-          <column width="-1" name="RouteLen" hidden="0" type="field"/>
-          <column width="-1" name="Source" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="Name" hidden="0" type="field"/>
-          <column width="-1" name="length_m" hidden="0" type="field"/>
-          <column width="-1" name="length_km" hidden="0" type="field"/>
-          <column width="-1" name="org_fid" hidden="0" type="field"/>
-          <column width="-1" name="first_runn" hidden="0" type="field"/>
-          <column width="-1" name="last_runne" hidden="0" type="field"/>
-          <column width="-1" name="descriptio" hidden="0" type="field"/>
-          <column width="-1" name="timestamp" hidden="0" type="field"/>
-          <column width="-1" name="end" hidden="0" type="field"/>
-          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column type="field" width="179" name="begin" hidden="0"/>
+          <column type="field" width="-1" name="RouteLen" hidden="0"/>
+          <column type="field" width="-1" name="Source" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="Name" hidden="0"/>
+          <column type="field" width="-1" name="length_m" hidden="0"/>
+          <column type="field" width="-1" name="length_km" hidden="0"/>
+          <column type="field" width="-1" name="org_fid" hidden="0"/>
+          <column type="field" width="-1" name="first_runn" hidden="0"/>
+          <column type="field" width="-1" name="last_runne" hidden="0"/>
+          <column type="field" width="-1" name="descriptio" hidden="0"/>
+          <column type="field" width="-1" name="timestamp" hidden="0"/>
+          <column type="field" width="-1" name="end" hidden="0"/>
+          <column type="field" width="-1" name="distance" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21922,58 +21911,58 @@ 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 name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -21981,7 +21970,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="0" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Line" styleCategories="AllStyleCategories" wkbType="MultiLineString">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiLineString" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="0" geometry="Line" simplifyMaxScale="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22055,326 +22044,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="190,178,151,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="190,178,151,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="136,127,108,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" label="Car" symbol="0"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="0" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="0" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="123,211,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="1" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="1" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="flat"/>
-                <Option name="customdash" type="QString" value="4;1;1;1"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="103,34,144,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="1.25"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="1"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
+            <layer pass="0" class="MarkerLine" enabled="1" locked="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
               <Option type="Map">
-                <Option name="average_angle_length" type="QString" value="4"/>
-                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="average_angle_unit" type="QString" value="MM"/>
-                <Option name="interval" type="QString" value="3"/>
-                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="interval_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_along_line" type="QString" value="0"/>
-                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_along_line_unit" type="QString" value="MM"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="place_on_every_part" type="bool" value="true"/>
-                <Option name="placements" type="QString" value="LastVertex"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="rotate" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@1@1" is_animated="0" force_rhr="0" type="marker">
+              <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@1@1" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
+                <layer pass="0" class="FilledMarker" enabled="1" locked="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
                   <Option type="Map">
-                    <Option name="angle" type="QString" value="0"/>
-                    <Option name="color" type="QString" value="103,34,144,255"/>
-                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                    <Option name="name" type="QString" value="filled_arrowhead"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="scale_method" type="QString" value="diameter"/>
-                    <Option name="size" type="QString" value="5"/>
-                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="size_unit" type="QString" value="MM"/>
-                    <Option name="vertical_anchor_point" type="QString" value="1"/>
+                    <Option 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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="@@1@1@0" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="@@1@1@0" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="103,34,144,255"/>
-                        <Option name="joinstyle" type="QString" value="miter"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="no"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -22387,66 +22376,66 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="QString" value="id"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22454,16 +22443,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="2" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="2" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22486,20 +22475,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="type"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="type" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="type" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -22507,13 +22496,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="type" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="type" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22545,12 +22534,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22558,7 +22547,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="0" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Point" styleCategories="AllStyleCategories" wkbType="Point">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="Point" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="0" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Point" simplifyMaxScale="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22632,291 +22621,291 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="145,82,45,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="145,82,45,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="104,59,32,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSize="15" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="Semibold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" fieldName="label" forcedBold="0" capitalization="0" isExpression="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="15" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="Semibold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="1" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="3" leftDirectionSymbol="&lt;"/>
-          <placement offsetUnits="MM" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="4" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" xOffset="0" lineAnchorClipping="0" distUnits="MM" layerType="UnknownGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="2000" drawLabels="1" unplacedVisibility="0" scaleMin="0" obstacleFactor="1" zIndex="0" limitNumLabels="0" obstacleType="0" scaleMax="0" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+          <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="3" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+          <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="UnknownGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MM" centroidInside="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="0" polygonPlacementFlags="2" xOffset="0" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+          <rendering upsidedownLabels="0" drawLabels="1" scaleMax="0" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="0" scaleMin="0" labelPerPart="0" obstacleFactor="1" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="2000" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-              <Option name="blendMode" type="int" value="0"/>
-              <Option name="ddProperties" type="Map">
-                <Option name="name" type="QString" value=""/>
+              <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
-              <Option name="drawToAllParts" type="bool" value="false"/>
-              <Option name="enabled" type="QString" value="0"/>
-              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-              <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option name="minLength" type="double" value="0"/>
-              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="minLengthUnit" type="QString" value="MM"/>
-              <Option name="offsetFromAnchor" type="double" value="0"/>
-              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-              <Option name="offsetFromLabel" type="double" value="0"/>
-              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+              <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option type="double" name="minLength" value="0"/>
+              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="minLengthUnit" value="MM"/>
+              <Option type="double" name="offsetFromAnchor" value="0"/>
+              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+              <Option type="double" name="offsetFromLabel" value="0"/>
+              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option 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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="1" strikethrough="0" bold="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0" strikethrough="0" style="0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22924,16 +22913,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="18" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="18">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22956,20 +22945,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="label"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="label" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
         <policy policy="Duplicate" field="label"/>
       </splitPolicies>
       <defaults>
-        <default expression="" field="id" applyOnUpdate="0"/>
-        <default expression="" field="label" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -22977,13 +22966,13 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" name="label" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="field" width="-1" name="label" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23015,12 +23004,12 @@ 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 name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -23028,7 +23017,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer legendPlaceholderImage="" maxScale="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" autoRefreshTime="0" labelsEnabled="1" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" minScale="100000000" type="vector" geometry="Polygon" styleCategories="AllStyleCategories" wkbType="MultiPolygon">
+    <maplayer styleCategories="AllStyleCategories" autoRefreshTime="0" wkbType="MultiPolygon" simplifyLocal="1" type="vector" simplifyAlgorithm="0" simplifyDrawingHints="1" autoRefreshEnabled="0" minScale="100000000" hasScaleBasedVisibilityFlag="0" maxScale="0" refreshOnNotifyEnabled="0" simplifyDrawingTol="1" symbologyReferenceScale="-1" readOnly="0" legendPlaceholderImage="" refreshOnNotifyMessage="" labelsEnabled="1" geometry="Polygon" simplifyMaxScale="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23094,7 +23083,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial dimensions="2" crs="" maxx="0" minx="0" maxy="0" maxz="0" minz="0" miny="0"/>
+          <spatial dimensions="2" miny="0" crs="" minz="0" maxy="0" maxx="0" maxz="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23119,267 +23108,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endExpression="" limitMode="0" mode="0" durationField="" startField="" fixedDuration="0" startExpression="" accumulate="0" enabled="0" durationUnit="min" endField="">
+      <temporal accumulate="0" mode="0" endField="" endExpression="" enabled="0" startField="" fixedDuration="0" limitMode="0" startExpression="" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation showMarkerSymbolInSurfacePlots="0" respectLayerSymbol="1" zoffset="0" extrusionEnabled="0" extrusion="0" zscale="1" type="IndividualFeatures" symbology="Line" clamping="Terrain" binding="Centroid">
+      <elevation type="IndividualFeatures" zoffset="0" clamping="Terrain" respectLayerSymbol="1" extrusion="0" binding="Centroid" zscale="1" symbology="Line" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="line_color" type="QString" value="125,139,143,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.6"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+          <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
+            <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
               <Option type="Map">
-                <Option name="angle" type="QString" value="0"/>
-                <Option name="cap_style" type="QString" value="square"/>
-                <Option name="color" type="QString" value="125,139,143,255"/>
-                <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="name" type="QString" value="diamond"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="89,99,102,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.2"/>
-                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="scale_method" type="QString" value="diameter"/>
-                <Option name="size" type="QString" value="3"/>
-                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="size_unit" type="QString" value="MM"/>
-                <Option name="vertical_anchor_point" type="QString" value="1"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 symbollevels="0" enableorderby="0" forceraster="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings calloutType="simple">
-              <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" useSubstitutions="0" fontItalic="0" isExpression="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="0.90000000000000002" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="31,120,180,255" forcedBold="0" multilineHeight="1" namedStyle="Bold" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" legendString="Aa" fieldName="label" textOrientation="horizontal" multilineHeightUnit="Percentage">
+              <text-style fontLetterSpacing="0" allowHtml="0" fieldName="label" forcedBold="0" capitalization="0" isExpression="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="31,120,180,255" textOrientation="horizontal" legendString="Aa" multilineHeightUnit="Percentage" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="0.90000000000000002" fontStrikeout="0" multilineHeight="1" namedStyle="Bold" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1" useSubstitutions="0">
                 <families/>
-                <text-buffer bufferBlendMode="0" bufferSize="0.75" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002"/>
-                <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-                <background shapeDraw="1" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,204" shapeOffsetUnit="MM" shapeOffsetY="-0.14999999999999999" shapeSizeX="0.75" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeRadiiY="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeJoinStyle="64" shapeSizeY="0.29999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="markerSymbol" is_animated="0" force_rhr="0" type="marker">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="0.75" bufferBlendMode="0" bufferDraw="0" bufferNoFill="0" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeBlendMode="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.75" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0.75" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,204" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="-0.14999999999999999" shapeSizeType="0" shapeSizeY="0.29999999999999999" shapeRotation="0" shapeRadiiY="0.5" shapeDraw="1">
+                  <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="markerSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="angle" type="QString" value="0"/>
-                        <Option name="cap_style" type="QString" value="square"/>
-                        <Option name="color" type="QString" value="196,60,57,255"/>
-                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                        <Option name="joinstyle" type="QString" value="bevel"/>
-                        <Option name="name" type="QString" value="circle"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0"/>
-                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="scale_method" type="QString" value="diameter"/>
-                        <Option name="size" type="QString" value="2"/>
-                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="size_unit" type="QString" value="MM"/>
-                        <Option name="vertical_anchor_point" type="QString" value="1"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+                  <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                       <Option type="Map">
-                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="color" type="QString" value="255,255,255,204"/>
-                        <Option name="joinstyle" type="QString" value="round"/>
-                        <Option name="offset" type="QString" value="0,0"/>
-                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                        <Option name="offset_unit" type="QString" value="MM"/>
-                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
-                        <Option name="outline_style" type="QString" value="solid"/>
-                        <Option name="outline_width" type="QString" value="0.75"/>
-                        <Option name="outline_width_unit" type="QString" value="MM"/>
-                        <Option name="style" type="QString" value="solid"/>
+                        <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option name="name" type="QString" value=""/>
+                          <Option type="QString" name="name" value=""/>
                           <Option name="properties"/>
-                          <Option name="type" type="QString" value="collection"/>
+                          <Option type="QString" name="type" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+                <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" wrapChar="" reverseDirectionSymbol="0" placeDirectionSymbol="0" addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" formatNumbers="0" plussign="0" decimals="3" rightDirectionSymbol=">" multilineAlign="1" leftDirectionSymbol="&lt;"/>
-              <placement offsetUnits="MapUnit" maxCurvedCharAngleIn="25" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistance="0" allowDegraded="0" geometryGeneratorEnabled="0" quadOffset="1" fitInPolygonOnly="0" geometryGenerator="" preserveRotation="1" maxCurvedCharAngleOut="-25" lineAnchorType="0" yOffset="0" lineAnchorPercent="0.5" lineAnchorTextPoint="CenterOfText" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" dist="0" xOffset="1" lineAnchorClipping="0" distUnits="MM" layerType="PolygonGeometry" rotationUnit="AngleDegrees" overrunDistance="0" offsetType="0" repeatDistanceUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" priority="5" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" polygonPlacementFlags="2" centroidInside="0" overlapHandling="PreventOverlap" placementFlags="10" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering fontLimitPixelSize="0" minFeatureSize="0" mergeLines="0" maxNumLabels="6" drawLabels="1" unplacedVisibility="0" scaleMin="1" obstacleFactor="0.76000000000000001" zIndex="5" limitNumLabels="0" obstacleType="0" scaleMax="10000000" scaleVisibility="0" fontMinPixelSize="3" labelPerPart="0" fontMaxPixelSize="10000" upsidedownLabels="0" obstacle="1"/>
+              <text-format autoWrapLength="0" wrapChar="" plussign="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0" formatNumbers="0" multilineAlign="1" decimals="3" rightDirectionSymbol=">" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0"/>
+              <placement lineAnchorType="0" preserveRotation="1" geometryGeneratorType="PointGeometry" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" allowDegraded="0" overrunDistance="0" repeatDistance="0" layerType="PolygonGeometry" lineAnchorClipping="0" rotationUnit="AngleDegrees" offsetUnits="MapUnit" centroidInside="0" quadOffset="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" centroidWhole="1" polygonPlacementFlags="2" xOffset="1" geometryGenerator="" priority="5" offsetType="0" maxCurvedCharAngleIn="25" overlapHandling="PreventOverlap" geometryGeneratorEnabled="0" placementFlags="10" overrunDistanceUnit="MM" lineAnchorTextPoint="CenterOfText" repeatDistanceUnits="MM" lineAnchorPercent="0.5" distUnits="MM" dist="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25"/>
+              <rendering upsidedownLabels="0" drawLabels="1" scaleMax="10000000" limitNumLabels="0" minFeatureSize="0" mergeLines="0" fontLimitPixelSize="0" zIndex="5" scaleMin="1" labelPerPart="0" obstacleFactor="0.76000000000000001" obstacleType="0" scaleVisibility="0" unplacedVisibility="0" maxNumLabels="6" fontMaxPixelSize="10000" fontMinPixelSize="3" obstacle="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
-                  <Option name="blendMode" type="int" value="0"/>
-                  <Option name="ddProperties" type="Map">
-                    <Option name="name" type="QString" value=""/>
+                  <Option 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 name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
-                  <Option name="drawToAllParts" type="bool" value="false"/>
-                  <Option name="enabled" type="QString" value="0"/>
-                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
-                  <Option name="lineSymbol" type="QString" value="&lt;symbol frame_rate=&quot;10&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; is_animated=&quot;0&quot; force_rhr=&quot;0&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option name="minLength" type="double" value="0"/>
-                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="minLengthUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromAnchor" type="double" value="0"/>
-                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
-                  <Option name="offsetFromLabel" type="double" value="0"/>
-                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
+                  <Option 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; is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; force_rhr=&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 pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option type="double" name="minLength" value="0"/>
+                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="minLengthUnit" value="MM"/>
+                  <Option type="double" name="offsetFromAnchor" value="0"/>
+                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
+                  <Option type="double" name="offsetFromLabel" value="0"/>
+                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -23388,72 +23377,72 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option name="QFieldSync/action" type="QString" value="copy"/>
-          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
-          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
-          <Option name="dualview/previewExpressions" type="List">
+          <Option type="QString" 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>
-          <Option name="embeddedWidgets/count" type="QString" value="0"/>
-          <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 attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" backgroundColor="#ffffff" enabled="0" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" spacingUnit="MM" penWidth="0" penAlpha="255" width="15" minScaleDenominator="0" rotationOffset="270" barWidth="5" spacing="0" direction="1" backgroundAlpha="255" showAxis="0" minimumSize="0" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" lineSizeType="MM" scaleBasedVisibility="0" sizeType="MM" sizeScale="3x:0,0,0,0,0,0" penColor="#000000" labelPlacementMethod="XHeight" height="15">
-          <fontProperties underline="0" italic="0" strikethrough="0" bold="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
-          <attribute colorOpacity="1" label="" color="#000000" field=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleDependency="Area" backgroundAlpha="255" direction="1" height="15" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" penColor="#000000" rotationOffset="270" labelPlacementMethod="XHeight" sizeScale="3x:0,0,0,0,0,0" penWidth="0" spacingUnit="MM" sizeType="MM" diagramOrientation="Up" penAlpha="255" enabled="0" maxScaleDenominator="1e+08" scaleBasedVisibility="0" barWidth="5" minimumSize="0" minScaleDenominator="0" showAxis="0" width="15">
+          <fontProperties description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0" strikethrough="0" style=""/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="35,35,35,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0.26"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="align_dash_pattern" value="0"/>
+                  <Option type="QString" name="capstyle" value="square"/>
+                  <Option type="QString" name="customdash" value="5;2"/>
+                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="customdash_unit" value="MM"/>
+                  <Option type="QString" name="dash_pattern_offset" value="0"/>
+                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
+                  <Option type="QString" name="draw_inside_polygon" value="0"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="line_color" value="35,35,35,255"/>
+                  <Option type="QString" name="line_style" value="solid"/>
+                  <Option type="QString" name="line_width" value="0.26"/>
+                  <Option type="QString" name="line_width_unit" value="MM"/>
+                  <Option type="QString" name="offset" value="0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="ring_filter" value="0"/>
+                  <Option type="QString" name="trim_distance_end" value="0"/>
+                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
+                  <Option type="QString" name="trim_distance_start" value="0"/>
+                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
+                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
+                  <Option type="QString" name="use_custom_dash" value="0"/>
+                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23461,22 +23450,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" linePlacementFlags="2" dist="0" priority="0" placement="0" zIndex="0" obstacle="0">
+      <DiagramLayerSettings dist="0" obstacle="0" priority="0" showAll="1" zIndex="0" placement="0" linePlacementFlags="2">
         <properties>
           <Option type="Map">
-            <Option name="name" type="QString" value=""/>
+            <Option type="QString" name="name" value=""/>
             <Option name="properties"/>
-            <Option name="type" type="QString" value="collection"/>
+            <Option type="QString" name="type" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option name="QgsGeometryGapCheck" type="Map">
-            <Option name="allowedGapsBuffer" type="double" value="0"/>
-            <Option name="allowedGapsEnabled" type="bool" value="false"/>
-            <Option name="allowedGapsLayer" type="QString" value=""/>
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" name="allowedGapsBuffer" value="0"/>
+            <Option type="bool" name="allowedGapsEnabled" value="false"/>
+            <Option type="QString" name="allowedGapsLayer" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -23487,8 +23476,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23497,8 +23486,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23507,8 +23496,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option name="IsMultiline" type="QString" value="0"/>
-                <Option name="UseHtml" type="QString" value="0"/>
+                <Option type="QString" name="IsMultiline" value="0"/>
+                <Option type="QString" name="UseHtml" value="0"/>
               </Option>
             </config>
           </editWidget>
@@ -23529,11 +23518,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
-        <alias name="" index="3" field="races"/>
-        <alias name="" index="4" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <splitPolicies>
         <policy policy="Duplicate" field="id"/>
@@ -23543,18 +23532,18 @@ def my_form_open(dialog, layer, feature):
         <policy policy="Duplicate" field="day"/>
       </splitPolicies>
       <defaults>
-        <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"/>
-        <default expression="" field="day" applyOnUpdate="0"/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="table_set" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="id" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="table_set" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="label" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="races" exp_strength="0"/>
-        <constraint unique_strength="0" notnull_strength="0" constraints="0" field="day" exp_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="id" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="table_set" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="label" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="races" unique_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" exp_strength="0" field="day" unique_strength="0" constraints="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" field="id" exp=""/>
@@ -23565,16 +23554,16 @@ def my_form_open(dialog, layer, feature):
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column width="-1" name="id" hidden="0" type="field"/>
-          <column width="-1" hidden="1" type="actions"/>
-          <column width="-1" name="table_set" hidden="0" type="field"/>
-          <column width="-1" name="label" hidden="0" type="field"/>
-          <column width="-1" name="day" hidden="0" type="field"/>
-          <column width="130" name="races" hidden="0" type="field"/>
+          <column type="field" width="-1" name="id" hidden="0"/>
+          <column type="actions" width="-1" hidden="1"/>
+          <column type="field" width="-1" name="table_set" hidden="0"/>
+          <column type="field" width="-1" name="label" hidden="0"/>
+          <column type="field" width="-1" name="day" hidden="0"/>
+          <column type="field" width="130" name="races" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23606,25 +23595,25 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="day"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="label"/>
-        <field editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="day" editable="1"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="label" reuseLastValue="0"/>
-        <field name="races" reuseLastValue="0"/>
-        <field name="table_set" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="label"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="table_set"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -23658,9 +23647,9 @@ def my_form_open(dialog, layer, feature):
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-    <layer id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
     <layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
     <layer id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+    <layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -23829,7 +23818,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Routes/20230907 - Gun Run 2023 - Routes 1.7.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230911 - Gun Run 2023 - Marshal Plan 1.7.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -23998,319 +23987,319 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option name="name" type="QString" value=""/>
+      <Option type="QString" name="name" value=""/>
       <Option name="properties"/>
-      <Option name="type" type="QString" value="collection"/>
+      <Option type="QString" name="type" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer visible="1" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer visible="1" expanded="0" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer visible="1" expanded="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 visible="1" expanded="1" style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer visible="1" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Fencing and Cones"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset" has-checked-group-info="1">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main" has-checked-group-info="1">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer visible="1" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal plan" has-checked-group-info="1">
-      <layer visible="1" expanded="1" style="default" id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <expanded-legend-nodes id="route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <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-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
-      <layer visible="0" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="0" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer visible="1" expanded="1" style="default" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-      <expanded-legend-nodes id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-      <layer visible="1" expanded="1" style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="0" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="1" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer visible="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <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-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer visible="1" expanded="0" style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer visible="1" expanded="1" style="default" id="water_tables20170921142016467"/>
+      <layer visible="1" expanded="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer visible="1" expanded="1" style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer visible="1" expanded="1" style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer visible="1" expanded="1" style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer visible="1" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer visible="1" expanded="1" style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer visible="1" expanded="1" style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer visible="1" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer visible="1" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer visible="1" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer visible="1" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer visible="1" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -24340,83 +24329,83 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Marshals" printResolution="120" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshals">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24424,15 +24413,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" id="" positionLock="true" zValue="6" position="158.226,6.0007,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="184.8" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="132.391" excludeFromExports="0" positionOnPage="158.226,6.0007,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="132.391,187.018,mm" itemRotation="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="132.391" type="65647" zValue="6" position="158.226,6.0007,mm" opacity="1" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" groupUuid="" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" positionLock="true" size="132.391,187.018,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="184.8" positionOnPage="158.226,6.0007,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24440,15 +24429,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem symbolWidth="7" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" legendFilterByAtlas="0" outlineWidthM="0.1,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="5" resizeToContents="1" frame="true" blendMode="0" positionOnPage="128.508,3.98741,mm" size="20.4703,32.2333,mm" background="true" groupUuid="" frameJoinStyle="bevel" position="128.508,3.98741,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="128" alpha="255" green="128" blue="128"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="128.508,3.98741,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="bevel" itemRotation="0" positionLock="true" zValue="5" outlineWidthM="0.1,mm" size="20.4703,32.2333,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="128.508,3.98741,mm" equalColumnWidth="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="128" blue="128" green="128"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24459,242 +24448,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="11" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.8805579999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="11" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.8805579999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="1" name="subgroup" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.1750019999999992" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="1" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.1750019999999992" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbol" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="8" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="3.8222239999999998" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="8" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="3.8222239999999998" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -24704,17 +24693,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -24722,166 +24711,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Inset map" positionLock="true" zValue="3" isTemporal="0" followPreset="true" mapRotation="0" position="98.7828,149.027,mm" blendMode="0" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.2,mm" excludeFromExports="0" positionOnPage="98.7828,149.027,mm" followPresetName="Marshal map - inset" type="65639" size="56.5192,54.5647,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" outlineWidthM="0.2,mm" drawCanvasItems="false" frame="true" type="65639" zValue="3" position="98.7828,149.027,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal map - inset" referencePoint="0" itemRotation="0" isTemporal="0" id="Inset map" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" keepLayerSet="false" positionLock="true" mapFlags="0" size="56.5192,54.5647,mm" visibility="1" positionOnPage="98.7828,149.027,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.39607548048533303" xmin="18.3917833749645645" ymin="-33.91073582826823696" ymax="-33.90659215121308279"/>
+        <Extent ymax="-33.90659215121308279" xmin="18.3917833749645645" ymin="-33.91073582826823696" xmax="18.39607548048533303"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24889,34 +24878,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" name="Overview 1" show="1">
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <ComposerMapOverview uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" inverted="0" blendMode="0" name="Overview 1" centered="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,65,170,127"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,102"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24924,9 +24913,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -24934,173 +24923,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Main map" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="3.53,6.0007,mm" blendMode="0" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.53,6.0007,mm" followPresetName="Marshal map - main" type="65639" size="142,187.018,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="2" position="3.53,6.0007,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal map - main" referencePoint="0" itemRotation="0" isTemporal="0" id="Main map" background="false" blendMode="0" followPreset="true" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" keepLayerSet="false" positionLock="true" mapFlags="0" size="142,187.018,mm" visibility="1" positionOnPage="3.53,6.0007,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.3944429313991229" xmin="18.39341592405077463" ymin="-33.90934028818313095" ymax="-33.90798769129818879"/>
+        <Extent ymax="-33.90798769129818879" xmin="18.39341592405077463" ymin="-33.90934028818313095" xmax="18.3944429313991229"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25108,28 +25097,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="26.6623" zValue="1" anchorPoint="0" northMode="0" pictureRotation="0" position="246.665,178.41,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="246.665,178.41,mm" pictureWidth="47.1065" type="65640" size="47.1065,27.6,mm" file="../GunRun2023_500.png" itemRotation="0" resizeMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="26.6623" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="1" position="246.665,178.41,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="47.1065" northOffset="0" size="47.1065,27.6,mm" anchorPoint="0" visibility="1" file="../GunRun2023_500.png" positionOnPage="246.665,178.41,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25137,14 +25126,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" url="" resizeMode="0" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
-        <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
+      <LayoutMultiFrame type="65648" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" maxBreakDistance="10" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;/tr>') %]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25154,112 +25143,112 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="bool" value="true"/>
-          <Option name="imageCropMarginBottom" type="int" value="0"/>
-          <Option name="imageCropMarginLeft" type="int" value="0"/>
-          <Option name="imageCropMarginRight" type="int" value="0"/>
-          <Option name="imageCropMarginTop" type="int" value="0"/>
-          <Option name="imageCropMarginUnit" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="bool" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="rasterize" type="QString" value="false"/>
-          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
-          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
-          <Option name="singleFile" type="bool" value="false"/>
+          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
+          <Option type="int" name="forceVector" value="0"/>
+          <Option type="bool" name="imageAntialias" value="true"/>
+          <Option type="int" name="imageCropMarginBottom" value="0"/>
+          <Option type="int" name="imageCropMarginLeft" value="0"/>
+          <Option type="int" name="imageCropMarginRight" value="0"/>
+          <Option type="int" name="imageCropMarginTop" value="0"/>
+          <Option type="QString" name="imageCropMarginUnit" value="0"/>
+          <Option type="bool" 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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c"/>
+          <Option 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="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="bool" name="singleFile" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" filterFeatures="0" sortKey="&quot;id&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" pageNameExpression="&quot;position&quot;" enabled="1" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" hideCoverage="0" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" pageNameExpression="&quot;position&quot;" filterFeatures="0" coverageLayerName="marshal_positions" sortKey="&quot;id&quot;" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" printResolution="300" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25267,21 +25256,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" mode="0" id="" positionLock="true" pictureHeight="7.97477" zValue="4" anchorPoint="0" northMode="0" pictureRotation="330" position="286.027,2,mm" blendMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="286.027,2,mm" pictureWidth="6.31767" type="65640" size="9.45865,11,mm" file="arrows/NorthArrow_11.svg" itemRotation="0" resizeMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="7.97477" svgBorderColor="0,0,0,255" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65640" zValue="4" position="286.027,2,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureRotation="330" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="6.31767" northOffset="0" size="9.45865,11,mm" anchorPoint="0" visibility="1" file="arrows/NorthArrow_11.svg" positionOnPage="286.027,2,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25289,476 +25278,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="3" marginY="1" position="285.027,205.886,mm" blendMode="0" labelText="[%upper( &quot;area&quot; )%]" referencePoint="0" valign="64" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="285.027,205.886,mm" type="65641" htmlState="0" size="142.543,10.3185,mm" itemRotation="270" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="3" position="285.027,205.886,mm" opacity="1" labelText="[%upper( &quot;area&quot; )%]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="270" id="" background="false" blendMode="0" marginY="1" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" size="142.543,10.3185,mm" valign="64" visibility="1" positionOnPage="285.027,205.886,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="miter" numUnitsPerSegment="100" unitLabel="m" lineCapStyle="square" unitType="meters" height="3" labelBarSpace="3" positionLock="true" minBarWidth="50" labelVerticalPlacement="0" numSegments="4" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelHorizontalPlacement="0" segmentMillimeters="26.3519" style="Single Box" referencePoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="7,189.669,mm" size="145.54,16.2165,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.3" frameJoinStyle="miter" position="7,189.669,mm" visibility="1" excludeFromExports="0" boxContentSpace="1" subdivisionsHeight="1.5" alignment="0" maxBarWidth="150">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" numSegments="4" outlineWidth="0.3" type="65646" style="Single Box" positionOnPage="7,189.669,mm" boxContentSpace="1" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" id="" height="3" numSubdivisions="1" labelBarSpace="3" referencePoint="0" subdivisionsHeight="1.5" frameJoinStyle="miter" itemRotation="0" positionLock="true" unitLabel="m" zValue="2" outlineWidthM="0.3,mm" lineCapStyle="square" size="145.54,16.2165,mm" labelHorizontalPlacement="0" alignment="0" visibility="1" unitType="meters" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" labelVerticalPlacement="0" lineJoinStyle="miter" minBarWidth="50" groupUuid="" numUnitsPerSegment="100" position="7,189.669,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" background="false" blendMode="0" frame="false" segmentSizeMode="1" segmentMillimeters="26.3519">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" alpha="255" green="0" blue="0"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="invalid"/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="invalid"/>
+            <Option type="invalid" name="decimal_separator"/>
+            <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="invalid" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" alpha="255" green="0" blue="0"/>
-        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.3"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="330" position="7,5.5,mm" blendMode="0" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="7,5.5,mm" followPresetName="Start/Finish" type="65639" size="278.027,180.318,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="7,5.5,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Start/Finish" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="false" blendMode="0" followPreset="true" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" keepLayerSet="false" positionLock="true" mapFlags="0" size="278.027,180.318,mm" visibility="1" positionOnPage="7,5.5,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="field" type="QString" value="rotation"/>
-                  <Option name="type" type="int" value="2"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="id"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymin="-33.90494830469008747" ymax="-33.89880140828828559"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="4" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="3" bottomAnnotationDisplay="3" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="5" unit="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25775,58 +25764,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -25834,117 +25823,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
-          <Option name="svgCropMarginBottom" type="QString" value="0"/>
-          <Option name="svgCropMarginLeft" type="QString" value="0"/>
-          <Option name="svgCropMarginRight" type="QString" value="0"/>
-          <Option name="svgCropMarginTop" type="QString" value="0"/>
-          <Option name="svgCropToContents" type="QString" value="true"/>
-          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
-          <Option name="svgGroupLayers" type="QString" value="false"/>
-          <Option name="svgIncludeMetadata" type="QString" value="1"/>
-          <Option name="svgTextFormat" type="QString" value="0"/>
+          <Option 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 coverageLayerName="start_finish_area" filterFeatures="0" sortKey="area" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" pageNameExpression="&quot;area&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" pageNameExpression="&quot;area&quot;" filterFeatures="0" coverageLayerName="start_finish_area" sortKey="area" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Cones" printResolution="300" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="300" name="Cones">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25952,15 +25941,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,67.2879,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="256.808,5.21277,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="11" outlineWidthM="0.3,mm" size="38.1563,67.2879,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="256.808,5.21277,mm" equalColumnWidth="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25971,242 +25960,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="group" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -26216,33 +26205,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" name="fencing" legend_exp="" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option name="legend/expressionFilter" type="QString" value=""/>
-                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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,4"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -26250,77 +26239,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="CONES: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="10" position="6.76779,191.188,mm" opacity="1" labelText="CONES: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" size="148.46,6.45211,mm" valign="32" visibility="1" positionOnPage="6.76779,191.188,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="56.3557" type="65647" zValue="9" position="182.723,191.188,mm" opacity="1" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" groupUuid="" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" positionLock="true" size="56.3557,6.45237,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="6.45237" positionOnPage="182.723,191.188,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26328,207 +26317,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="8" position="212.257,198.083,mm" opacity="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" size="26.8205,6.82826,mm" valign="32" visibility="1" positionOnPage="212.257,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="6" marginY="0" position="116.805,198.083,mm" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="116.805,198.083,mm" type="65641" htmlState="0" size="64.7594,7.10512,mm" itemRotation="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="6" position="116.805,198.083,mm" opacity="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" size="64.7594,7.10512,mm" valign="32" visibility="1" positionOnPage="116.805,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="52.7903,7.07327,mm" itemRotation="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="5" position="6.76779,198.083,mm" opacity="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" size="52.7903,7.07327,mm" valign="32" visibility="1" positionOnPage="6.76779,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="28.0105" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="4" position="243.098,175.353,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="49.3143" northOffset="0" size="49.3143,29.8354,mm" anchorPoint="8" visibility="1" file="../GunRun2023_250.png" positionOnPage="243.098,175.353,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -26536,380 +26525,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="6.91779,197.79,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" size="232.01,0.14328,mm" visibility="1" positionOnPage="6.91779,197.79,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="500" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelHorizontalPlacement="0" segmentMillimeters="30.2878" style="Double Box" referencePoint="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="104.399,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" numSegments="2" outlineWidth="0.2" type="65646" style="Double Box" positionOnPage="6.76779,2.8482,mm" boxContentSpace="0.2" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" id="" height="2" numSubdivisions="1" labelBarSpace="1" referencePoint="0" subdivisionsHeight="1.5" frameJoinStyle="miter" itemRotation="0" positionLock="true" unitLabel="m" zValue="2" outlineWidthM="0.3,mm" lineCapStyle="square" size="104.399,15.8378,mm" labelHorizontalPlacement="0" alignment="0" visibility="1" unitType="meters" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" labelVerticalPlacement="0" lineJoinStyle="round" minBarWidth="25" groupUuid="" numUnitsPerSegment="500" position="6.76779,2.8482,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" background="false" blendMode="0" frame="false" segmentSizeMode="1" segmentMillimeters="30.2878">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" alpha="255" green="0" blue="0"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="invalid"/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="invalid"/>
+            <Option type="invalid" name="decimal_separator"/>
+            <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="invalid" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" alpha="255" green="0" blue="0"/>
-        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="6.76779,9.35102,mm" labelMargin="0,mm" opacity="0.9" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Fencing" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="false" blendMode="0" followPreset="true" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" keepLayerSet="false" positionLock="true" mapFlags="0" size="283.418,180.92,mm" visibility="1" positionOnPage="6.76779,9.35102,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" type="double" value="1"/>
-                      <Option name="maxOutput" type="double" value="360"/>
-                      <Option name="maxValue" type="double" value="0"/>
-                      <Option name="minOutput" type="double" value="0"/>
-                      <Option name="minValue" type="double" value="0"/>
-                      <Option name="nullOutput" type="double" value="0"/>
+              <Option 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 name="t" type="int" value="0"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option name="type" type="int" value="3"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40002634434715745" xmin="18.35799642373467222" ymin="-33.94965747213089458" ymax="-33.92282769675949083"/>
+        <Extent ymax="-33.92282769675948373" xmin="18.35799642373368457" ymin="-33.94965747213089458" xmax="18.4000263443481451"/>
         <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>
@@ -26924,92 +26913,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="4" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="3" bottomAnnotationDisplay="3" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="5" unit="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27026,58 +27015,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27085,21 +27074,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" url="" resizeMode="0" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
+      <LayoutMultiFrame type="65648" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" maxBreakDistance="10" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27109,250 +27098,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="rasterize" type="QString" value="true"/>
-          <Option name="singleFile" type="bool" value="true"/>
+          <Option 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="pdfExportGeoPdfFeatures" 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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+          <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="rasterize" value="true"/>
+          <Option type="bool" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="cone_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayerName="cone_groups" sortKey="&quot;group&quot;" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="9" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="9"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="8" marginY="1" position="4.43449,186.634,mm" blendMode="0" labelText="Directions to Start of Race" referencePoint="0" valign="64" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,186.634,mm" type="65641" htmlState="0" size="83.9998,10.4638,mm" itemRotation="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="8" position="4.43449,186.634,mm" opacity="1" labelText="Directions to Start of Race" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" size="83.9998,10.4638,mm" valign="64" visibility="1" positionOnPage="4.43449,186.634,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="false" zValue="7" marginY="1" position="4.43449,197.498,mm" blendMode="0" labelText="Gun Run" referencePoint="0" valign="32" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="4.43449,197.498,mm" type="65641" htmlState="0" size="48.2923,9.511,mm" itemRotation="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="4.43449,197.498,mm" opacity="1" labelText="Gun Run" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" size="48.2923,9.511,mm" valign="32" visibility="1" positionOnPage="4.43449,197.498,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem symbolWidth="9" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="5" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="0" legendFilterByMap="1" positionLock="false" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="true" blendMode="0" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" background="true" groupUuid="" frameJoinStyle="round" position="10.096,10.8563,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="139" alpha="255" green="139" blue="139"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" legendFilterByMap="1" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="10.096,10.8563,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="round" itemRotation="0" positionLock="false" zValue="6" outlineWidthM="0.3,mm" size="59.0766,76,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorder="1" symbolWidth="9" wmsLegendWidth="50" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="10.096,10.8563,mm" equalColumnWidth="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="5" columnSpace="0" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="139" blue="139" green="139"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27363,242 +27352,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="7.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="16" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="7.6444479999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbolLabel" indent="0" marginLeft="3">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbolLabel" marginLeft="3">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -27608,32 +27597,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Ask Me" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" type="QString" value="hidden"/>
+                <Option type="QString" name="legend/title-style" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="poi_labels" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" name="poi_labels" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
-                  <Option name="legend/label-1" type="QString" value="Toilets"/>
-                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
-                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
-                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
-                  <Option name="legend/label-5" type="QString" value="Parking"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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 legend_split_behavior="0" expanded="1" patch_size="0,0" name="directions_to_start" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" name="directions_to_start" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
-                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
-                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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>
@@ -27641,145 +27630,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="5" marginY="1" position="221.862,190.027,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="221.862,190.027,mm" type="65641" htmlState="0" size="27.7839,6.871,mm" itemRotation="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="221.862,190.027,mm" opacity="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" size="27.7839,6.871,mm" valign="32" visibility="1" positionOnPage="221.862,190.027,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="false" zValue="4" marginY="1" position="197.975,197.498,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="197.975,197.498,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="4" position="197.975,197.498,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" size="51.6706,6.60801,mm" valign="64" visibility="1" positionOnPage="197.975,197.498,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="false" pictureHeight="24.3824" zValue="3" anchorPoint="4" northMode="0" pictureRotation="0" position="249.646,179.724,mm" blendMode="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="249.646,179.724,mm" pictureWidth="24.2337" type="65640" size="42.9838,24.3824,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="24.3824" svgBorderColor="0,0,0,255" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65640" zValue="3" position="249.646,179.724,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureRotation="0" positionLock="false" svgFillColor="255,255,255,255" pictureWidth="24.2337" northOffset="0" size="42.9838,24.3824,mm" anchorPoint="4" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="249.646,179.724,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27787,85 +27776,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="false" zValue="2" position="4.58449,197.248,mm" blendMode="0" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="4.58449,197.248,mm" type="65643" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" itemRotation="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="2" position="4.58449,197.248,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" size="244.912,0.1,mm" visibility="1" positionOnPage="4.58449,197.248,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{25dc84af-8724-465b-a42c-c6c013132998}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="4.43449,6.411,mm" blendMode="0" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="4.43449,6.411,mm" followPresetName="Ask Me" type="65639" size="288.007,183.616,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="4.43449,6.411,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Ask Me" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" keepLayerSet="false" positionLock="false" mapFlags="0" size="288.007,183.616,mm" visibility="1" positionOnPage="4.43449,6.411,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymin="-33.90994364588821952" ymax="-33.8970204297764468"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
         <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>
@@ -27880,149 +27869,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28030,318 +28019,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option 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 filterFeatures="0" coverageLayer="" hideCoverage="0" pageNameExpression="" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" hideCoverage="0" sortFeatures="0" coverageLayer="" pageNameExpression="" filterFeatures="0"/>
     </Layout>
-    <Layout worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" name="Routes" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" printResolution="144" name="Routes">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="13" marginY="0" position="200.171,199.082,mm" blendMode="0" labelText="REVISION 1.6" referencePoint="0" valign="32" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="200.171,199.082,mm" type="65641" htmlState="0" size="61.5373,6.8714,mm" itemRotation="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="13" position="200.171,199.082,mm" opacity="1" labelText="REVISION 1.7" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" size="61.5373,6.8714,mm" valign="32" visibility="1" positionOnPage="200.171,199.082,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="12" marginY="0" position="9.7863,192.073,mm" blendMode="0" labelText="Gun Run 2023: [%&quot;Source&quot;%]" referencePoint="0" valign="64" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,192.073,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="12" position="9.7863,192.073,mm" opacity="1" labelText="Gun Run 2023: [%&quot;Source&quot;%]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" size="61.5373,6.60801,mm" valign="64" visibility="1" positionOnPage="9.7863,192.073,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="11" marginY="0" position="9.7863,199.082,mm" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" referencePoint="0" valign="32" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.7863,199.082,mm" type="65641" htmlState="0" size="61.5373,6.60801,mm" itemRotation="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="11" position="9.7863,199.082,mm" opacity="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" size="61.5373,6.60801,mm" valign="32" visibility="1" positionOnPage="9.7863,199.082,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="16.8993" zValue="10" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="29.7523" type="65640" size="29.7523,17.4718,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="16.8993" svgBorderColor="0,0,0,255" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" type="65640" zValue="10" position="262.196,188.218,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="29.7523" northOffset="0" size="29.7523,17.4718,mm" anchorPoint="4" visibility="1" file="../GunRun2023_250.png" positionOnPage="262.196,188.218,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28349,374 +28338,374 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="9" position="9.57644,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.57644,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" itemRotation="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="9" position="9.57644,198.832,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" size="251.982,0.1,mm" visibility="1" positionOnPage="9.57644,198.832,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Finish" positionLock="true" zValue="8" isTemporal="0" followPreset="true" mapRotation="0" position="8.21644,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="8.21644,4.09761,mm" followPresetName="Routes" type="65639" size="109.221,188.689,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" outlineWidthM="0.3,mm" drawCanvasItems="true" frame="true" type="65639" zValue="8" position="8.21644,4.09761,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Trail Finish" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" keepLayerSet="false" positionLock="true" mapFlags="0" size="109.221,188.689,mm" visibility="1" positionOnPage="8.21644,4.09761,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymin="-33.93242806047424409" ymax="-33.90007966676468953"/>
+        <Extent ymax="-33.90007966676468953" xmin="18.39314911415855391" ymin="-33.93242806047424409" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Trail Start" positionLock="true" zValue="7" isTemporal="0" followPreset="true" mapRotation="0" position="113.002,2.39423,mm" blendMode="0" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="113.002,2.39423,mm" followPresetName="Routes" type="65639" size="179.156,191.505,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" outlineWidthM="0.3,mm" drawCanvasItems="true" frame="true" type="65639" zValue="7" position="113.002,2.39423,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Trail Start" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" keepLayerSet="false" positionLock="true" mapFlags="0" size="179.156,191.505,mm" visibility="1" positionOnPage="113.002,2.39423,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymin="-33.95791657202656921" ymax="-33.92465573363980269"/>
+        <Extent ymax="-33.92465573363980269" xmin="18.3924263991010406" ymin="-33.95791657202656921" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="Left inset 21KM" positionLock="true" zValue="6" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="true" type="65639" zValue="6" position="5.86559,4.09761,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Left inset 21KM" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" keepLayerSet="false" positionLock="true" mapFlags="0" size="67.7828,166.874,mm" visibility="1" positionOnPage="5.86559,4.09761,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymin="-33.94700000000000273" ymax="-33.91681492292400435"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Bottom inset 21KM" positionLock="true" zValue="5" isTemporal="0" followPreset="true" mapRotation="0" position="131.391,120.702,mm" blendMode="0" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="131.391,120.702,mm" followPresetName="Routes" type="65639" size="113.3,76.1023,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true">
-        <FrameColor red="103" alpha="255" green="34" blue="144"/>
-        <BackgroundColor red="200" alpha="128" green="175" blue="215"/>
+      <LayoutItem templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" outlineWidthM="0.3,mm" drawCanvasItems="true" frame="true" type="65639" zValue="5" position="131.391,120.702,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Bottom inset 21KM" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" keepLayerSet="false" positionLock="true" mapFlags="0" size="113.3,76.1023,mm" visibility="1" positionOnPage="131.391,120.702,mm">
+        <FrameColor alpha="255" red="103" blue="144" green="34"/>
+        <BackgroundColor alpha="128" red="200" blue="215" green="175"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedOpacity" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymin="-33.9168317482614512" ymax="-33.91132718340826813"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="1" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="1" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="true" id="Main Map" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="8.14144,4.02261,mm" blendMode="0" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="8.14144,4.02261,mm" followPresetName="Routes" type="65639" size="282.732,188.839,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" outlineWidthM="0.15,mm" drawCanvasItems="true" frame="true" type="65639" zValue="1" position="8.14144,4.02261,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="round" excludeFromExports="0" followPresetName="Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="Main Map" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" keepLayerSet="false" positionLock="true" mapFlags="0" size="282.732,188.839,mm" visibility="1" positionOnPage="8.14144,4.02261,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 '10500'&#xa;WHEN &quot;Source&quot; ILIKE '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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedMapYMin" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
               </Option>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymin="-33.92600000000000193" ymax="-33.8918539481981469"/>
+        <Extent ymax="-33.8918539481981469" xmin="18.37199999999999989" ymin="-33.92600000000000193" xmax="18.42312398088981951"/>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28724,40 +28713,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview blendMode="0" centered="1" inverted="0" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" name="Overview 1" show="1">
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <ComposerMapOverview uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1" inverted="0" blendMode="0" name="Overview 1" centered="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
-                <Option name="properties" type="Map">
-                  <Option name="alpha" type="Map">
-                    <Option name="active" type="bool" value="true"/>
-                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                    <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="103,34,144,26"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="103,34,144,255"/>
-                <Option name="outline_style" type="QString" value="solid"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28765,9 +28754,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28775,115 +28764,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="singleFile" type="QString" value="true"/>
+          <Option 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~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+          <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 coverageLayerName="all_routes" filterFeatures="1" sortKey="&quot;Sort&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" pageNameExpression="&quot;Distance&quot;" enabled="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" coverageLayerProvider="ogr" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortFeatures="1"/>
+      <Atlas sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" hideCoverage="0" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" pageNameExpression="&quot;Distance&quot;" filterFeatures="1" coverageLayerName="all_routes" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" printResolution="120" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan A1">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="594,841,mm" itemRotation="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" size="594,841,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28891,15 +28880,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="8" resizeToContents="1" frame="false" blendMode="0" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" background="true" groupUuid="" frameJoinStyle="miter" position="25.5925,18.7971,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="25.5925,18.7971,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="8" outlineWidthM="0.3,mm" size="4,4,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="25.5925,18.7971,mm" equalColumnWidth="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="false" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28910,242 +28899,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="16" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.6444479999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="1" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="1" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbol" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29155,17 +29144,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" checked="Qt::Checked" legend_exp="" id="all_routes20170907054841602">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes20170907054841602" name="all_routes" legend_exp="">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="QString" value="0"/>
+                  <Option 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>
@@ -29173,207 +29162,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.2963,808.939,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="5.2963,808.939,mm" type="65641" htmlState="0" size="91.9494,15.0649,mm" itemRotation="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="5.2963,808.939,mm" opacity="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" size="91.9494,15.0649,mm" valign="64" visibility="1" positionOnPage="5.2963,808.939,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="430.403,825.052,mm" blendMode="0" labelText="REVISION 1.2" referencePoint="0" valign="32" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="430.403,825.052,mm" type="65641" htmlState="0" size="56.6212,15.3656,mm" itemRotation="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="430.403,825.052,mm" opacity="1" labelText="REVISION 1.2" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" size="56.6212,15.3656,mm" valign="32" visibility="1" positionOnPage="430.403,825.052,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="4" marginY="1" position="372.175,808.942,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="372.175,808.942,mm" type="65641" htmlState="0" size="114.848,15.0635,mm" itemRotation="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="4" position="372.175,808.942,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" size="114.848,15.0635,mm" valign="64" visibility="1" positionOnPage="372.175,808.942,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="63.9757" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="489.557,775.395,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="489.557,775.395,mm" pictureWidth="63.5856" type="65640" size="100.498,63.9757,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="63.9757" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="3" position="489.557,775.395,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="63.5856" northOffset="0" size="100.498,63.9757,mm" anchorPoint="8" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="489.557,775.395,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29381,199 +29370,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.4463,824.155,mm" blendMode="0" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.4463,824.155,mm" type="65643" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" itemRotation="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="2" position="5.4463,824.155,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" size="481.428,0.606138,mm" visibility="1" positionOnPage="5.4463,824.155,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="3.94474,5.25965,mm" blendMode="0" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="3.94474,5.25965,mm" followPresetName="Marshal plan" type="65639" size="584.759,811.213,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="true" type="65639" zValue="1" position="3.94474,5.25965,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal plan" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" keepLayerSet="false" positionLock="true" mapFlags="0" size="584.759,811.213,mm" visibility="1" positionOnPage="3.94474,5.25965,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymin="-33.95821655848814657" ymax="-33.89072661913806428"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option 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 coverageLayerName="complete_marshal_overview" filterFeatures="0" sortKey="page" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayerName="complete_marshal_overview" sortKey="page" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="144" name="Access Roads">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="0" titleAlignment="1" opacity="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="15" resizeToContents="1" frame="true" blendMode="0" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" background="true" groupUuid="" frameJoinStyle="miter" position="244.484,130.172,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="185" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="244.484,130.172,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="15" outlineWidthM="0.3,mm" size="34.45,40.8,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="244.484,130.172,mm" equalColumnWidth="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="185" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29581,242 +29570,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="group" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -29826,15 +29815,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Residents Access" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Residents Access" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="residents_access_roads" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" name="residents_access_roads" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option type="invalid" name="expandedLegendNodes"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -29842,207 +29831,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS" referencePoint="0" valign="64" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="8" position="9.37446,191.81,mm" opacity="1" labelText="ACCESS ROUTES FOR RESIDENTS" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" size="194.851,7.272,mm" valign="64" visibility="1" positionOnPage="9.37446,191.81,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.1" referencePoint="0" valign="64" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="6" position="204.225,191.81,mm" opacity="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" size="57.4836,6.8714,mm" valign="64" visibility="1" positionOnPage="204.225,191.81,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="210.038,199.082,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" size="51.6706,6.60801,mm" valign="64" visibility="1" positionOnPage="210.038,199.082,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="17.4718" svgBorderColor="0,0,0,255" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" type="65640" zValue="4" position="262.196,188.218,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="17.3653" northOffset="0" size="29.7523,17.4718,mm" anchorPoint="4" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30050,100 +30039,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="9.59946,198.832,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" size="251.959,0.1,mm" visibility="1" positionOnPage="9.59946,198.832,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="2" isTemporal="0" followPreset="true" mapRotation="0" position="5.86559,4.09761,mm" blendMode="0" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" frame="true" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.86559,4.09761,mm" followPresetName="Access Routes" type="65639" size="67.7828,166.874,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="true" type="65639" zValue="2" position="5.86559,4.09761,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Access Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" keepLayerSet="false" positionLock="true" mapFlags="0" size="67.7828,166.874,mm" visibility="1" positionOnPage="5.86559,4.09761,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="type" type="int" value="1"/>
-                  <Option name="val" type="QString" value=""/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymin="-33.94652930000000168" ymax="-33.91513741583252539"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
         <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>
@@ -30158,149 +30147,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30308,45 +30297,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="9.44946,9.08557,mm" blendMode="0" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frame="true" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,9.08557,mm" followPresetName="Access Routes" type="65639" size="282.012,175.592,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" outlineWidthM="0.15,mm" drawCanvasItems="false" frame="true" type="65639" zValue="1" position="9.44946,9.08557,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="round" excludeFromExports="0" followPresetName="Access Routes" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" keepLayerSet="false" positionLock="true" mapFlags="0" size="282.012,175.592,mm" visibility="1" positionOnPage="9.44946,9.08557,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymin="-33.92999999999999972" ymax="-33.89697816224119009"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
         <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>
@@ -30361,149 +30350,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30511,318 +30500,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option 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 coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" hideCoverage="1" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayerName="residents_access" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" printResolution="144" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" position="0" orientation="2" units="mm"/>
+          <Guide units="mm" orientation="2" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="8" marginY="1" position="9.37446,191.81,mm" blendMode="0" labelText="Access to P9 Parking and VIP Tent" referencePoint="0" valign="64" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="9.37446,191.81,mm" type="65641" htmlState="0" size="194.851,7.272,mm" itemRotation="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="8" position="9.37446,191.81,mm" opacity="1" labelText="Access to P9 Parking and VIP Tent" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" size="194.851,7.272,mm" valign="64" visibility="1" positionOnPage="9.37446,191.81,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="6" marginY="1" position="204.225,191.81,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="64" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="204.225,191.81,mm" type="65641" htmlState="0" size="57.4836,6.8714,mm" itemRotation="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="6" position="204.225,191.81,mm" opacity="1" labelText="REVISION 1.0" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" size="57.4836,6.8714,mm" valign="64" visibility="1" positionOnPage="204.225,191.81,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="5" marginY="1" position="210.038,199.082,mm" blendMode="0" labelText="Sunday, 20 October 2019" referencePoint="0" valign="64" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="210.038,199.082,mm" type="65641" htmlState="0" size="51.6706,6.60801,mm" itemRotation="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="5" position="210.038,199.082,mm" opacity="1" labelText="Sunday, 20 October 2019" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" size="51.6706,6.60801,mm" valign="64" visibility="1" positionOnPage="210.038,199.082,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="17.4718" zValue="4" anchorPoint="4" northMode="0" pictureRotation="0" position="262.196,188.218,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="262.196,188.218,mm" pictureWidth="17.3653" type="65640" size="29.7523,17.4718,mm" file="../Gun_Run_Logo.png" itemRotation="0" resizeMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="17.4718" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="4" position="262.196,188.218,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="17.3653" northOffset="0" size="29.7523,17.4718,mm" anchorPoint="4" visibility="1" file="../Gun_Run_Logo.png" positionOnPage="262.196,188.218,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30830,85 +30819,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="9.59946,198.832,mm" blendMode="0" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="9.59946,198.832,mm" type="65643" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" itemRotation="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="9.59946,198.832,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" size="251.959,0.1,mm" visibility="1" positionOnPage="9.59946,198.832,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{025604c1-b118-4f15-b140-54c9145260c4}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="false" mapRotation="0" position="9.44946,7.25098,mm" blendMode="0" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" frame="false" visibility="1" groupUuid="" frameJoinStyle="round" outlineWidthM="0.15,mm" excludeFromExports="0" positionOnPage="9.44946,7.25098,mm" followPresetName="" type="65639" size="282.012,182.649,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" outlineWidthM="0.15,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="9.44946,7.25098,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="round" excludeFromExports="0" followPresetName="" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="false" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" keepLayerSet="false" positionLock="false" mapFlags="0" size="282.012,182.649,mm" visibility="1" positionOnPage="9.44946,7.25098,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="active" type="bool" value="true"/>
-                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option name="type" type="int" value="3"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymin="-33.90848231674397084" ymax="-33.90319854486631357"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
         <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>
@@ -30923,149 +30912,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalY="0" name="Grid 1" frameAnnotationDistance="1" intervalX="0" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" unit="0" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="0" rotatedTicksMinimumAngle="0" annotationFormat="0" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="0" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="0" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="0" bottomAnnotationDisplay="0" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="0" unit="0" bottomAnnotationPosition="1" topAnnotationDisplay="0" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="0,0,0,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31073,108 +31062,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="QString" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
-          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
-          <Option name="pdfTextFormat" type="QString" value="0"/>
-          <Option name="singleFile" type="QString" value="false"/>
+          <Option 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 coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerProvider="ogr" sortFeatures="0"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" hideCoverage="1" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" pageNameExpression="&quot;FID&quot;" filterFeatures="0" coverageLayerName="residents_access" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" printResolution="120" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="120" name="Marshal Plan">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,420,mm" itemRotation="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" size="297,420,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31182,15 +31171,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" id="" positionLock="true" zValue="9" position="112.086,406.476,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.2" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="23.5967" excludeFromExports="0" positionOnPage="112.086,406.476,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="23.5967,8.3142,mm" itemRotation="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="23.5967" type="65647" zValue="9" position="112.086,406.476,mm" opacity="1" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" groupUuid="" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" positionLock="true" size="23.5967,8.3142,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="8.3142" positionOnPage="112.086,406.476,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31198,139 +31187,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="1" position="214.292,406.874,mm" blendMode="0" labelText="REVISION 1.4" referencePoint="0" valign="32" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="214.292,406.874,mm" type="65641" htmlState="0" size="27.7839,7.51682,mm" itemRotation="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="8" position="214.292,406.874,mm" opacity="1" labelText="REVISION 1.7" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" size="27.7839,7.51682,mm" valign="32" visibility="1" positionOnPage="214.292,406.874,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="5.69321,398.344,mm" blendMode="0" labelText="MARSHAL POSITIONS" referencePoint="0" valign="64" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="5.69321,398.344,mm" type="65641" htmlState="0" size="45.1194,8.13137,mm" itemRotation="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="5.69321,398.344,mm" opacity="1" labelText="MARSHAL POSITIONS" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" size="45.1194,8.13137,mm" valign="64" visibility="1" positionOnPage="5.69321,398.344,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem symbolWidth="7" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="6" resizeToContents="1" frame="false" blendMode="0" positionOnPage="15.6525,12.5708,mm" size="22.2406,33.2917,mm" background="true" groupUuid="" frameJoinStyle="miter" position="15.6525,12.5708,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="15.6525,12.5708,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="6" outlineWidthM="0.3,mm" size="22.2406,33.2917,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="15.6525,12.5708,mm" equalColumnWidth="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="false" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31341,242 +31330,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="16" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="6.6444479999999997" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="16" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="6.6444479999999997" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <text-style fontSize="14" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.9388920000000001" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="14" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.9388920000000001" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="1" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="1" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbol" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -31586,19 +31575,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option name="legend/title-style" type="QString" value="group"/>
+                <Option type="QString" name="legend/title-style" value="group"/>
               </Option>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -31606,15 +31595,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" id="" positionLock="true" zValue="5" position="5.69321,406.988,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.2" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="118.192" excludeFromExports="0" positionOnPage="5.69321,406.988,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="118.192,7.80192,mm" itemRotation="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="118.192" type="65647" zValue="5" position="5.69321,406.988,mm" opacity="1" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" groupUuid="" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" positionLock="true" size="118.192,7.80192,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="7.80192" positionOnPage="5.69321,406.988,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31622,15 +31611,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" id="" positionLock="true" zValue="4" position="148.501,398.344,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="7.2" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="93.5757" excludeFromExports="0" positionOnPage="148.501,398.344,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="93.5757,8.13167,mm" itemRotation="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="93.5757" type="65647" zValue="4" position="148.501,398.344,mm" opacity="1" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" groupUuid="" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" positionLock="true" size="93.5757,8.13167,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="8.13167" positionOnPage="148.501,398.344,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31638,21 +31627,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="27.9119" zValue="3" anchorPoint="8" northMode="0" pictureRotation="0" position="243.319,382.696,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.319,382.696,mm" pictureWidth="49.3143" type="65640" size="49.3143,31.2967,mm" file="../../Gun Run 2023.png" itemRotation="0" resizeMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="27.9119" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="3" position="243.319,382.696,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="49.3143" northOffset="0" size="49.3143,31.2967,mm" anchorPoint="8" visibility="1" file="../../Gun Run 2023.png" positionOnPage="243.319,382.696,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31660,101 +31649,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="2" position="5.84321,406.626,mm" blendMode="0" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="5.84321,406.626,mm" type="65643" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" itemRotation="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="2" position="5.84321,406.626,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" size="236.083,0.14328,mm" visibility="1" positionOnPage="5.84321,406.626,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="true" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="5.03,5.9483,mm" blendMode="0" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="5.03,5.9483,mm" followPresetName="Marshal plan" type="65639" size="286.94,392.396,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="5.03,5.9483,mm" labelMargin="0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Marshal plan" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="true" blendMode="0" followPreset="true" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" keepLayerSet="false" positionLock="true" mapFlags="0" size="286.94,392.396,mm" visibility="1" positionOnPage="5.03,5.9483,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapScale" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+              <Option 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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value=""/>
-                  <Option name="type" type="int" value="2"/>
+                <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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38613924055453452" xmin="18.36924763341120581" ymin="-33.94797288016833647" ymax="-33.92487327745350711"/>
+        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" url="" resizeMode="0" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" contentMode="1" html="Page [% &quot;page&quot; %] " maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
-        <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
+      <LayoutMultiFrame type="65648" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" maxBreakDistance="10" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="Page [% &quot;page&quot; %] " resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31762,14 +31751,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" url="" resizeMode="0" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
-        <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
+      <LayoutMultiFrame type="65648" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" maxBreakDistance="10" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31777,14 +31766,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" url="" resizeMode="0" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
+      <LayoutMultiFrame type="65648" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" maxBreakDistance="10" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31794,99 +31783,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~route_markers_ec6aa753_0326_4069_a6f2_e9bae5c16a43~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option 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~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+          <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 coverageLayerName="marshal_overviews" filterFeatures="0" sortKey="page" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" pageNameExpression="&quot;page&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="ogr" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" pageNameExpression="&quot;page&quot;" filterFeatures="0" coverageLayerName="marshal_overviews" sortKey="page" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" printResolution="300" units="mm">
-      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
-      <Grid offsetY="0" offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm"/>
+    <Layout units="mm" worldFileMap="" printResolution="300" name="Fencing">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid offsetUnits="mm" offsetY="0" offsetX="0" resUnits="mm" resolution="10"/>
       <PageCollection>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="255,255,255,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="no"/>
-              <Option name="outline_width" type="QString" value="0.26"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" id="" positionLock="false" zValue="0" position="0,0,mm" blendMode="0" referencePoint="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="0,0,mm" type="65638" size="297,210,mm" itemRotation="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" background="true">
-          <FrameColor red="0" alpha="255" green="0" blue="0"/>
-          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+        <LayoutItem templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" outlineWidthM="0.3,mm" frame="false" type="65638" zValue="0" position="0,0,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="true" blendMode="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" size="297,210,mm" visibility="1" positionOnPage="0,0,mm">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="miter"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31894,15 +31883,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem symbolWidth="7" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" legendFilterByAtlas="0" outlineWidthM="0.3,mm" itemRotation="0" symbolHeight="4" rasterBorder="1" rasterBorderColor="0,0,0,255" columnSpace="2" positionLock="true" equalColumnWidth="1" titleAlignment="1" opacity="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" minSymbolSize="0" columnCount="1" wmsLegendHeight="25" referencePoint="0" rasterBorderWidth="0" maxSymbolSize="0" type="65642" id="" zValue="11" resizeToContents="0" frame="true" blendMode="0" positionOnPage="256.808,5.21277,mm" size="38.1563,68.0108,mm" background="true" groupUuid="" frameJoinStyle="miter" position="256.808,5.21277,mm" wrapChar="" title="" visibility="1" excludeFromExports="0" splitLayer="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" wmsLegendWidth="50" symbolAlignment="1">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem rasterBorderWidth="0" splitLayer="0" type="65642" minSymbolSize="0" positionOnPage="256.808,5.21277,mm" id="" maxSymbolSize="0" referencePoint="0" frameJoinStyle="miter" itemRotation="0" positionLock="true" zValue="11" outlineWidthM="0.3,mm" size="38.1563,68.0108,mm" visibility="1" wrapChar="" titleAlignment="1" resizeToContents="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" rasterBorder="1" symbolWidth="7" wmsLegendWidth="50" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendHeight="25" opacity="1" groupUuid="" boxSpace="2" position="256.808,5.21277,mm" equalColumnWidth="1" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" excludeFromExports="0" symbolAlignment="1" background="true" blendMode="0" columnCount="1" symbolHeight="4" columnSpace="2" frame="true" rasterBorderColor="0,0,0,255" title="" legendFilterByAtlas="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31913,242 +31902,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" alignment="1" name="title">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="group" indent="0">
-            <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="5.2333359999999995" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="group">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="5.2333359999999995" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="3" name="subgroup" indent="0">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="75" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="3" alignment="1" name="subgroup">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="75" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2.5" name="symbol" indent="0">
-            <text-style fontSize="9" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <style indent="0" marginTop="2.5" alignment="1" name="symbol">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="9" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
           </style>
-          <style alignment="1" marginTop="2" name="symbolLabel" indent="0" marginLeft="2">
-            <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="4.5277799999999999" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="MM">
+          <style indent="0" marginTop="2" alignment="1" name="symbolLabel" marginLeft="2">
+            <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="MM" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="4.5277799999999999" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
               <families/>
-              <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-              <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-              <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-                <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+              <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+              <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+              <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+                <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                     <Option type="Map">
-                      <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="color" type="QString" value="255,255,255,255"/>
-                      <Option name="joinstyle" type="QString" value="bevel"/>
-                      <Option name="offset" type="QString" value="0,0"/>
-                      <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                      <Option name="offset_unit" type="QString" value="MM"/>
-                      <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                      <Option name="outline_style" type="QString" value="no"/>
-                      <Option name="outline_width" type="QString" value="0"/>
-                      <Option name="outline_width_unit" type="QString" value="MM"/>
-                      <Option name="style" type="QString" value="solid"/>
+                      <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="color" value="255,255,255,255"/>
+                      <Option type="QString" name="joinstyle" value="bevel"/>
+                      <Option type="QString" name="offset" value="0,0"/>
+                      <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                      <Option type="QString" name="offset_unit" value="MM"/>
+                      <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                      <Option type="QString" name="outline_style" value="no"/>
+                      <Option type="QString" name="outline_width" value="0"/>
+                      <Option type="QString" name="outline_width_unit" value="MM"/>
+                      <Option type="QString" name="style" value="solid"/>
                     </Option>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option name="name" type="QString" value=""/>
+                        <Option type="QString" name="name" value=""/>
                         <Option name="properties"/>
-                        <Option name="type" type="QString" value="collection"/>
+                        <Option type="QString" name="type" value="collection"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+              <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </dd_properties>
             </text-style>
@@ -32158,33 +32147,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="fencing" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" name="fencing" legend_exp="" source="./fencing.shp|layername=fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option name="legend/expressionFilter" type="QString" value=""/>
-                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option 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,4"/>
+                  <Option type="QString" name="legend/title-style" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_split_behavior="0" expanded="1" patch_size="0,0" name="all_routes" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_exp="" providerKey="ogr" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" name="all_routes" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
-                  <Option name="legend/title-style" type="QString" value="hidden"/>
-                  <Option name="showFeatureCount" type="int" value="0"/>
+                  <Option 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>
@@ -32192,77 +32181,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="10" marginY="0" position="6.76779,191.188,mm" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]" referencePoint="0" valign="32" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,191.188,mm" type="65641" htmlState="0" size="148.46,6.45211,mm" itemRotation="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="10" position="6.76779,191.188,mm" opacity="1" labelText="FENCING: [% &quot;name&quot; %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" positionLock="true" size="148.46,6.45211,mm" valign="32" visibility="1" positionOnPage="6.76779,191.188,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="63" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="63" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" id="" positionLock="true" zValue="9" position="182.723,191.188,mm" blendMode="0" hideBackgroundIfEmpty="0" sectionY="0" referencePoint="0" sectionHeight="5.76" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" sectionWidth="56.3557" excludeFromExports="0" positionOnPage="182.723,191.188,mm" sectionX="0" hidePageIfEmpty="0" type="65647" size="56.3557,6.45237,mm" itemRotation="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" outlineWidthM="0.3,mm" frame="false" sectionY="0" sectionWidth="56.3557" type="65647" zValue="9" position="182.723,191.188,mm" opacity="1" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" groupUuid="" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" sectionX="0" hidePageIfEmpty="0" id="" background="false" blendMode="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" positionLock="true" size="56.3557,6.45237,mm" hideBackgroundIfEmpty="0" visibility="1" sectionHeight="6.45237" positionOnPage="182.723,191.188,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32270,207 +32259,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="2" id="" positionLock="true" zValue="8" marginY="0" position="209.146,198.083,mm" blendMode="0" labelText="REVISION 1.0" referencePoint="0" valign="32" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="209.146,198.083,mm" type="65641" htmlState="0" size="26.8205,6.82826,mm" itemRotation="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="2" zValue="8" position="212.258,198.083,mm" opacity="1" labelText="REVISION 1.1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" positionLock="true" size="26.8205,6.82826,mm" valign="32" visibility="1" positionOnPage="212.258,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="7" marginY="1" position="62.6706,198.083,mm" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" referencePoint="0" valign="32" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="1" positionOnPage="62.6706,198.083,mm" type="65641" htmlState="0" size="51.1638,7.07327,mm" itemRotation="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="7" position="62.6706,198.083,mm" opacity="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="1" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" positionLock="true" size="51.1638,7.07327,mm" valign="32" visibility="1" positionOnPage="62.6706,198.083,mm" marginX="1">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" halign="1" id="" positionLock="true" zValue="5" marginY="0" position="6.76779,198.083,mm" blendMode="0" labelText="Page [% @atlas_featurenumber %]" referencePoint="0" valign="32" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" marginX="0" positionOnPage="6.76779,198.083,mm" type="65641" htmlState="0" size="90.2083,7.07327,mm" itemRotation="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" outlineWidthM="0.3,mm" htmlState="0" frame="false" type="65641" halign="1" zValue="5" position="6.76779,198.083,mm" opacity="1" labelText="Page [% @atlas_featurenumber %]" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" marginY="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" positionLock="true" size="90.2083,7.07327,mm" valign="32" visibility="1" positionOnPage="6.76779,198.083,mm" marginX="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" mode="1" id="" positionLock="true" pictureHeight="28.0105" zValue="4" anchorPoint="8" northMode="0" pictureRotation="0" position="243.098,175.353,mm" blendMode="0" mapUuid="" referencePoint="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" frame="false" visibility="1" groupUuid="" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" svgFillColor="255,255,255,255" northOffset="0" positionOnPage="243.098,175.353,mm" pictureWidth="49.3143" type="65640" size="49.3143,29.8354,mm" file="../GunRun2023_250.png" itemRotation="0" resizeMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" outlineWidthM="0.3,mm" svgBorderWidth="0.2" frame="false" pictureHeight="28.0105" svgBorderColor="0,0,0,255" mapUuid="" type="65640" zValue="4" position="243.098,175.353,mm" opacity="1" groupUuid="" northMode="0" frameJoinStyle="miter" excludeFromExports="0" mode="1" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" pictureRotation="0" positionLock="true" svgFillColor="255,255,255,255" pictureWidth="49.3143" northOffset="0" size="49.3143,29.8354,mm" anchorPoint="8" visibility="1" file="../GunRun2023_250.png" positionOnPage="243.098,175.353,mm" resizeMode="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedSource" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="type" type="int" value="3"/>
+              <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32478,380 +32467,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" id="" positionLock="true" zValue="3" position="6.91779,197.79,mm" blendMode="0" referencePoint="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" shapeType="1" positionOnPage="6.91779,197.79,mm" type="65643" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" itemRotation="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" outlineWidthM="0.3,mm" frame="false" shapeType="1" cornerRadiusMeasure="0,mm" type="65643" zValue="3" position="6.91779,197.79,mm" opacity="1" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" referencePoint="0" itemRotation="0" id="" background="false" blendMode="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" size="232.01,0.14328,mm" visibility="1" positionOnPage="6.91779,197.79,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+        <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
+          <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
             <Option type="Map">
-              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="color" type="QString" value="0,0,0,255"/>
-              <Option name="joinstyle" type="QString" value="miter"/>
-              <Option name="offset" type="QString" value="0,0"/>
-              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-              <Option name="offset_unit" type="QString" value="MM"/>
-              <Option name="outline_color" type="QString" value="0,0,0,255"/>
-              <Option name="outline_style" type="QString" value="solid"/>
-              <Option name="outline_width" type="QString" value="0.3"/>
-              <Option name="outline_width_unit" type="QString" value="MM"/>
-              <Option name="style" type="QString" value="solid"/>
+              <Option 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>
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" outlineWidthM="0.3,mm" itemRotation="0" lineJoinStyle="round" numUnitsPerSegment="20" unitLabel="m" lineCapStyle="square" unitType="meters" height="2" labelBarSpace="1" positionLock="true" minBarWidth="25" labelVerticalPlacement="0" numSegments="2" numMapUnitsPerScaleBarUnit="1" opacity="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" labelHorizontalPlacement="0" segmentMillimeters="25.8173" style="Double Box" referencePoint="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" type="65646" id="" zValue="2" numSegmentsLeft="2" numSubdivisions="1" frame="false" blendMode="0" positionOnPage="6.76779,2.8482,mm" size="87.2133,15.8378,mm" background="false" groupUuid="" segmentSizeMode="1" outlineWidth="0.2" frameJoinStyle="miter" position="6.76779,2.8482,mm" visibility="1" excludeFromExports="0" boxContentSpace="0.2" subdivisionsHeight="1.5" alignment="0" maxBarWidth="100">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" numSegments="2" outlineWidth="0.2" type="65646" style="Double Box" positionOnPage="6.76779,2.8482,mm" boxContentSpace="0.2" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" id="" height="2" numSubdivisions="1" labelBarSpace="1" referencePoint="0" subdivisionsHeight="1.5" frameJoinStyle="miter" itemRotation="0" positionLock="true" unitLabel="m" zValue="2" outlineWidthM="0.3,mm" lineCapStyle="square" size="87.2133,15.8378,mm" labelHorizontalPlacement="0" alignment="0" visibility="1" unitType="meters" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" opacity="1" labelVerticalPlacement="0" lineJoinStyle="round" minBarWidth="25" groupUuid="" numUnitsPerSegment="20" position="6.76779,2.8482,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" excludeFromExports="0" background="false" blendMode="0" frame="false" segmentSizeMode="1" segmentMillimeters="25.8173">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSize="12" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+        <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="12" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
           <families/>
-          <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-          <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-          <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+          <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+            <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                 <Option type="Map">
-                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="color" type="QString" value="255,255,255,255"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                  <Option name="outline_style" type="QString" value="no"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="style" type="QString" value="solid"/>
+                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="color" value="255,255,255,255"/>
+                  <Option type="QString" name="joinstyle" value="bevel"/>
+                  <Option type="QString" name="offset" value="0,0"/>
+                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option type="QString" name="offset_unit" value="MM"/>
+                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                  <Option type="QString" name="outline_style" value="no"/>
+                  <Option type="QString" name="outline_width" value="0"/>
+                  <Option type="QString" name="outline_width_unit" value="MM"/>
+                  <Option type="QString" name="style" value="solid"/>
                 </Option>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+          <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
           <dd_properties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" alpha="255" green="0" blue="0"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option name="decimal_separator" type="invalid"/>
-            <Option name="decimals" type="int" value="6"/>
-            <Option name="rounding_type" type="int" value="0"/>
-            <Option name="show_plus" type="bool" value="false"/>
-            <Option name="show_thousand_separator" type="bool" value="true"/>
-            <Option name="show_trailing_zeros" type="bool" value="false"/>
-            <Option name="thousand_separator" type="invalid"/>
+            <Option type="invalid" name="decimal_separator"/>
+            <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="invalid" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" alpha="255" green="0" blue="0"/>
-        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{ba8b697f-af10-49bc-b789-55678d099479}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+          <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
+            <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
               <Option type="Map">
-                <Option name="align_dash_pattern" type="QString" value="0"/>
-                <Option name="capstyle" type="QString" value="square"/>
-                <Option name="customdash" type="QString" value="5;2"/>
-                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="customdash_unit" type="QString" value="MM"/>
-                <Option name="dash_pattern_offset" type="QString" value="0"/>
-                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                <Option name="draw_inside_polygon" type="QString" value="0"/>
-                <Option name="joinstyle" type="QString" value="round"/>
-                <Option name="line_color" type="QString" value="0,0,0,255"/>
-                <Option name="line_style" type="QString" value="solid"/>
-                <Option name="line_width" type="QString" value="0.2"/>
-                <Option name="line_width_unit" type="QString" value="MM"/>
-                <Option name="offset" type="QString" value="0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="ring_filter" type="QString" value="0"/>
-                <Option name="trim_distance_end" type="QString" value="0"/>
-                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                <Option name="trim_distance_start" type="QString" value="0"/>
-                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                <Option name="use_custom_dash" type="QString" value="0"/>
-                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="0,0,0,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="fill">
+          <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
+            <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
               <Option type="Map">
-                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="color" type="QString" value="255,255,255,255"/>
-                <Option name="joinstyle" type="QString" value="bevel"/>
-                <Option name="offset" type="QString" value="0,0"/>
-                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                <Option name="offset_unit" type="QString" value="MM"/>
-                <Option name="outline_color" type="QString" value="35,35,35,255"/>
-                <Option name="outline_style" type="QString" value="no"/>
-                <Option name="outline_width" type="QString" value="0.26"/>
-                <Option name="outline_width_unit" type="QString" value="MM"/>
-                <Option name="style" type="QString" value="solid"/>
+                <Option 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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" labelMargin="0,mm" drawCanvasItems="false" id="" positionLock="false" zValue="1" isTemporal="0" followPreset="true" mapRotation="0" position="6.76779,9.35102,mm" blendMode="0" referencePoint="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" frame="false" visibility="1" groupUuid="" frameJoinStyle="miter" outlineWidthM="0.3,mm" excludeFromExports="0" positionOnPage="6.76779,9.35102,mm" followPresetName="Fencing" type="65639" size="283.418,180.92,mm" keepLayerSet="false" itemRotation="0" mapFlags="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" background="false">
-        <FrameColor red="0" alpha="255" green="0" blue="0"/>
-        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
+      <LayoutItem templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" outlineWidthM="0.3,mm" drawCanvasItems="false" frame="false" type="65639" zValue="1" position="6.76779,9.35102,mm" labelMargin="0,mm" opacity="0.9" groupUuid="" frameJoinStyle="miter" excludeFromExports="0" followPresetName="Fencing" referencePoint="0" itemRotation="0" isTemporal="0" id="" background="false" blendMode="0" followPreset="true" mapRotation="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" keepLayerSet="false" positionLock="true" mapFlags="0" size="283.418,180.92,mm" visibility="1" positionOnPage="6.76779,9.35102,mm">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
-              <Option name="properties" type="Map">
-                <Option name="dataDefinedMapRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="expression" type="QString" value=""/>
-                  <Option name="transformer" type="Map">
-                    <Option name="d" type="Map">
-                      <Option name="exponent" type="double" value="1"/>
-                      <Option name="maxOutput" type="double" value="360"/>
-                      <Option name="maxValue" type="double" value="0"/>
-                      <Option name="minOutput" type="double" value="0"/>
-                      <Option name="minValue" type="double" value="0"/>
-                      <Option name="nullOutput" type="double" value="0"/>
+              <Option 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 name="t" type="int" value="0"/>
+                    <Option type="int" name="t" value="0"/>
                   </Option>
-                  <Option name="type" type="int" value="3"/>
+                  <Option type="int" name="type" value="3"/>
                 </Option>
-                <Option name="dataDefinedRotation" type="Map">
-                  <Option name="active" type="bool" value="false"/>
-                  <Option name="field" type="QString" value="angle"/>
-                  <Option name="type" type="int" value="2"/>
+                <Option 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 name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.37821516684363488" xmin="18.37624285840067628" ymin="-33.94258732662760991" ymax="-33.94132830492694808"/>
+        <Extent ymax="-33.94132830492694808" xmin="18.37624285840067628" ymin="-33.94258732662760991" xmax="18.37821516684363488"/>
         <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>
@@ -32866,92 +32855,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rotatedTicksEnabled="0" offsetX="0" minimumIntervalWidth="50" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalY="5" name="Grid 1" frameAnnotationDistance="1" intervalX="5" rotatedAnnotationsMarginToCorner="0" rotatedTicksMarginToCorner="0" gridStyle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationPosition="1" bottomAnnotationDisplay="3" unit="1" gridFrameWidth="2" maximumIntervalWidth="100" rightFrameDivisions="0" leftAnnotationDirection="0" topAnnotationDirection="0" leftAnnotationDisplay="3" rotatedTicksMinimumAngle="0" annotationFormat="4" annotationExpression="" showAnnotation="0" gridFrameSideFlags="15" gridFrameMargin="0" rightAnnotationPosition="1" crossLength="3" leftAnnotationPosition="1" leftFrameDivisions="0" annotationPrecision="3" gridFramePenThickness="0.5" bottomAnnotationDirection="0" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" blendMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMinimumAngle="0" bottomFrameDivisions="0" gridFrameStyle="0" topFrameDivisions="0" frameFillColor2="0,0,0,255" position="3" show="0" gridFramePenColor="0,0,0,255" rotatedTicksLengthMode="0" topAnnotationDisplay="3" rightAnnotationDirection="0" offsetY="0">
+        <ComposerMapGrid frameFillColor2="0,0,0,255" rotatedAnnotationsLengthMode="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" topAnnotationPosition="1" offsetX="0" showAnnotation="0" show="0" gridFrameSideFlags="15" bottomFrameDivisions="0" annotationFormat="4" rotatedAnnotationsMarginToCorner="0" rightAnnotationDisplay="3" bottomAnnotationDisplay="3" topAnnotationDirection="0" annotationPrecision="3" gridFrameWidth="2" rotatedTicksEnabled="0" gridFrameStyle="0" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" annotationExpression="" rotatedTicksLengthMode="0" rightAnnotationPosition="1" intervalY="5" unit="1" bottomAnnotationPosition="1" topAnnotationDisplay="3" minimumIntervalWidth="50" maximumIntervalWidth="100" offsetY="0" name="Grid 1" crossLength="3" rotatedAnnotationsEnabled="0" topFrameDivisions="0" rotatedTicksMinimumAngle="0" gridFrameMargin="0" leftFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" leftAnnotationDirection="0" intervalX="5" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" position="3" gridFramePenColor="0,0,0,255" blendMode="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" rightFrameDivisions="0" gridStyle="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="line">
+            <symbol type="line" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
+              <layer pass="0" class="SimpleLine" enabled="1" locked="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
                 <Option type="Map">
-                  <Option name="align_dash_pattern" type="QString" value="0"/>
-                  <Option name="capstyle" type="QString" value="square"/>
-                  <Option name="customdash" type="QString" value="5;2"/>
-                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="customdash_unit" type="QString" value="MM"/>
-                  <Option name="dash_pattern_offset" type="QString" value="0"/>
-                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
-                  <Option name="draw_inside_polygon" type="QString" value="0"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="line_color" type="QString" value="195,195,195,255"/>
-                  <Option name="line_style" type="QString" value="solid"/>
-                  <Option name="line_width" type="QString" value="0"/>
-                  <Option name="line_width_unit" type="QString" value="MM"/>
-                  <Option name="offset" type="QString" value="0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="ring_filter" type="QString" value="0"/>
-                  <Option name="trim_distance_end" type="QString" value="0"/>
-                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
-                  <Option name="trim_distance_start" type="QString" value="0"/>
-                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
-                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
-                  <Option name="use_custom_dash" type="QString" value="0"/>
-                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="" is_animated="0" force_rhr="0" type="marker">
+            <symbol type="marker" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="" force_rhr="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option name="name" type="QString" value=""/>
+                  <Option type="QString" name="name" value=""/>
                   <Option name="properties"/>
-                  <Option name="type" type="QString" value="collection"/>
+                  <Option type="QString" name="type" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
+              <layer pass="0" class="SimpleMarker" enabled="1" locked="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
                 <Option type="Map">
-                  <Option name="angle" type="QString" value="0"/>
-                  <Option name="cap_style" type="QString" value="square"/>
-                  <Option name="color" type="QString" value="0,0,0,255"/>
-                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
-                  <Option name="joinstyle" type="QString" value="bevel"/>
-                  <Option name="name" type="QString" value="circle"/>
-                  <Option name="offset" type="QString" value="0,0"/>
-                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="offset_unit" type="QString" value="MM"/>
-                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
-                  <Option name="outline_style" type="QString" value="solid"/>
-                  <Option name="outline_width" type="QString" value="0"/>
-                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="outline_width_unit" type="QString" value="MM"/>
-                  <Option name="scale_method" type="QString" value="diameter"/>
-                  <Option name="size" type="QString" value="2"/>
-                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                  <Option name="size_unit" type="QString" value="MM"/>
-                  <Option name="vertical_anchor_point" type="QString" value="1"/>
+                  <Option 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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -32968,58 +32957,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSize="10" allowHtml="0" fontSizeUnit="Point" fontItalic="0" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontLetterSpacing="0" fontWeight="50" blendMode="0" textOpacity="1" fontUnderline="0" fontKerning="1" fontWordSpacing="0" textColor="0,0,0,255" forcedBold="0" multilineHeight="1" namedStyle="" capitalization="0" fontStrikeout="0" fontFamily="Myriad Pro" textOrientation="horizontal" multilineHeightUnit="Percentage">
+          <text-style fontLetterSpacing="0" allowHtml="0" forcedBold="0" capitalization="0" fontWeight="50" forcedItalic="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,0,0,255" textOrientation="horizontal" multilineHeightUnit="Percentage" fontSize="10" fontWordSpacing="0" blendMode="0" textOpacity="1" fontStrikeout="0" multilineHeight="1" namedStyle="" previewBkgrdColor="255,255,255,255" fontSizeUnit="Point" fontItalic="0" fontUnderline="0" fontFamily="Myriad Pro" fontKerning="1">
             <families/>
-            <text-buffer bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferNoFill="1" bufferColor="255,255,255,255" bufferOpacity="1"/>
-            <text-mask maskEnabled="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskOpacity="1" maskType="0" maskedSymbolLayers="" maskSizeUnits="MM" maskJoinStyle="128"/>
-            <background shapeDraw="0" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeFillColor="255,255,255,255" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeX="0" shapeRotationType="0" shapeSizeType="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOpacity="1" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeJoinStyle="64" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM">
-              <symbol frame_rate="10" alpha="1" clip_to_extent="1" name="fillSymbol" is_animated="0" force_rhr="0" type="fill">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSize="1" bufferBlendMode="0" bufferDraw="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1"/>
+            <text-mask maskType="0" maskSizeUnits="MM" maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskEnabled="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeBlendMode="0" shapeOpacity="1" shapeSizeX="0" shapeType="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderWidth="0" shapeOffsetX="0" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeOffsetUnit="MM" shapeOffsetY="0" shapeSizeType="0" shapeSizeY="0" shapeRotation="0" shapeRadiiY="0" shapeDraw="0">
+              <symbol type="fill" is_animated="0" alpha="1" clip_to_extent="1" frame_rate="10" name="fillSymbol" force_rhr="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option name="name" type="QString" value=""/>
+                    <Option type="QString" name="name" value=""/>
                     <Option name="properties"/>
-                    <Option name="type" type="QString" value="collection"/>
+                    <Option type="QString" name="type" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer pass="0" class="SimpleFill" enabled="1" locked="0" id="">
                   <Option type="Map">
-                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="color" type="QString" value="255,255,255,255"/>
-                    <Option name="joinstyle" type="QString" value="bevel"/>
-                    <Option name="offset" type="QString" value="0,0"/>
-                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
-                    <Option name="offset_unit" type="QString" value="MM"/>
-                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
-                    <Option name="outline_style" type="QString" value="no"/>
-                    <Option name="outline_width" type="QString" value="0"/>
-                    <Option name="outline_width_unit" type="QString" value="MM"/>
-                    <Option name="style" type="QString" value="solid"/>
+                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="color" value="255,255,255,255"/>
+                    <Option type="QString" name="joinstyle" value="bevel"/>
+                    <Option type="QString" name="offset" value="0,0"/>
+                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option type="QString" name="offset_unit" value="MM"/>
+                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
+                    <Option type="QString" name="outline_style" value="no"/>
+                    <Option type="QString" name="outline_width" value="0"/>
+                    <Option type="QString" name="outline_width_unit" value="MM"/>
+                    <Option type="QString" name="style" value="solid"/>
                   </Option>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option name="name" type="QString" value=""/>
+                      <Option type="QString" name="name" value=""/>
                       <Option name="properties"/>
-                      <Option name="type" type="QString" value="collection"/>
+                      <Option type="QString" name="type" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetDist="1"/>
+            <shadow shadowOffsetUnit="MM" shadowUnder="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOpacity="0.69999999999999996" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option name="name" type="QString" value=""/>
+                <Option type="QString" name="name" value=""/>
                 <Option name="properties"/>
-                <Option name="type" type="QString" value="collection"/>
+                <Option type="QString" name="type" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33027,21 +33016,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings clippingType="0" enabled="0" restrictLayers="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings clippingType="0" enabled="0" clipSource="" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutMultiFrame evaluateExpressions="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" url="" resizeMode="0" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" maxBreakDistance="10" type="65648" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
-        <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
+      <LayoutMultiFrame type="65648" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" maxBreakDistance="10" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" useSmartBreaks="true" evaluateExpressions="true" stylesheetEnabled="true" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" resizeMode="0" contentMode="1" url="">
+        <childFrame uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option name="name" type="QString" value=""/>
+              <Option type="QString" name="name" value=""/>
               <Option name="properties"/>
-              <Option name="type" type="QString" value="collection"/>
+              <Option type="QString" name="type" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33051,38 +33040,38 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option name="atlasRasterFormat" type="QString" value="png"/>
-          <Option name="forceVector" type="int" value="0"/>
-          <Option name="imageAntialias" type="QString" value="true"/>
-          <Option name="imageCropMarginBottom" type="QString" value="0"/>
-          <Option name="imageCropMarginLeft" type="QString" value="0"/>
-          <Option name="imageCropMarginRight" type="QString" value="0"/>
-          <Option name="imageCropMarginTop" type="QString" value="0"/>
-          <Option name="imageCropToContents" type="QString" value="false"/>
-          <Option name="pdfAppendGeoreference" type="int" value="1"/>
-          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
-          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
-          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
-          <Option name="pdfExportThemes" type="QString" value=""/>
-          <Option name="pdfIncludeMetadata" type="int" value="1"/>
-          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_be2596c1_1ef9_4a30_9dfc_f382dbd1be02"/>
-          <Option name="pdfLosslessImages" type="int" value="0"/>
-          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
-          <Option name="pdfSimplify" type="int" value="1"/>
-          <Option name="pdfTextFormat" type="int" value="0"/>
-          <Option name="rasterize" type="QString" value="true"/>
-          <Option name="singleFile" type="bool" value="true"/>
+          <Option 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="pdfExportGeoPdfFeatures" 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_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
+          <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="rasterize" value="true"/>
+          <Option type="bool" name="singleFile" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" filterFeatures="0" sortKey="&quot;group&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" hideCoverage="1" pageNameExpression="&quot;name&quot;" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" coverageLayerProvider="virtual" sortFeatures="1"/>
+      <Atlas sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" enabled="1" hideCoverage="1" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" pageNameExpression="&quot;name&quot;" filterFeatures="0" coverageLayerName="fence_groups" sortKey="&quot;group&quot;" coverageLayerProvider="virtual"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <Sensors/>
-  <ProjectViewSettings rotation="0" UseProjectScales="0">
+  <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.43564544749748535" xmin="18.38044081847287714" ymin="-33.91875794015667367" ymax="-33.88880497692461091">
+    <DefaultViewExtent ymax="-33.90684867733166641" xmin="18.40541208561092645" ymin="-33.90836307879926892" xmax="18.40820319414218176">
       <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>
@@ -33099,7 +33088,7 @@ def my_form_open(dialog, layer, feature):
   <ProjectStyleSettings RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings frameRate="1" timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
+  <ProjectTimeSettings timeStep="1" frameRate="1" cumulativeTemporalRange="0" timeStepUnit="h"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider offset="0" scale="1"/>
@@ -33108,29 +33097,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option name="decimal_separator" type="invalid"/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="direction_format" type="int" value="0"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="invalid"/>
+        <Option type="invalid" name="decimal_separator"/>
+        <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="invalid" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
-        <Option name="decimal_separator" type="invalid"/>
-        <Option name="decimals" type="int" value="6"/>
-        <Option name="rounding_type" type="int" value="0"/>
-        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
-        <Option name="show_leading_zeros" type="bool" value="false"/>
-        <Option name="show_plus" type="bool" value="false"/>
-        <Option name="show_suffix" type="bool" value="false"/>
-        <Option name="show_thousand_separator" type="bool" value="true"/>
-        <Option name="show_trailing_zeros" type="bool" value="false"/>
-        <Option name="thousand_separator" type="invalid"/>
+        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
+        <Option type="invalid" name="decimal_separator"/>
+        <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="invalid" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
     <CoordinateCustomCrs>
@@ -33147,7 +33136,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerSource="Point?crs=EPSG:4326&amp;uid={305e318e-cd81-40c4-81e9-2245844ce765}" destinationFollowsActiveLayer="1" autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayerProvider="memory" destinationLayer="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" destinationLayerName="route_markers">
+  <ProjectGpsSettings autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayerName="marshal_positions" destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" destinationFollowsActiveLayer="1" destinationLayerProvider="ogr" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index 5bf5bf4..4e1640c 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 bd56747..0c683a0 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 0a66c8a..354bc62 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/fencing.dbf b/GIS Base Map/fencing.dbf
index feb3590..b842a30 100644
Binary files a/GIS Base Map/fencing.dbf and b/GIS Base Map/fencing.dbf differ
diff --git a/GIS Base Map/fencing.shp b/GIS Base Map/fencing.shp
index 769c5c7..3a62cfd 100644
Binary files a/GIS Base Map/fencing.shp and b/GIS Base Map/fencing.shp differ
diff --git a/GIS Base Map/fencing.shx b/GIS Base Map/fencing.shx
index a8739b7..14efebd 100644
Binary files a/GIS Base Map/fencing.shx and b/GIS Base Map/fencing.shx differ
diff --git a/GIS Base Map/marshal_positions.dbf b/GIS Base Map/marshal_positions.dbf
index fb2cc89..541791a 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 08a790b..0006eba 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 d8cefa9..fe953b0 100644
Binary files a/GIS Base Map/marshal_positions.shx and b/GIS Base Map/marshal_positions.shx differ